Author: avg
Date: Fri Oct 13 09:05:20 2017
New Revision: 324582
URL: https://svnweb.freebsd.org/changeset/base/324582
Log:
MFC r323524: MFV r316932: 6280 libzfs: unshare_one() could fail with
EZFS_SHARENFSFAILED
Modified:
stable/10/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c
==============================================================================
--- stable/10/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c Fri Oct
13 07:50:44 2017 (r324581)
+++ stable/10/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c Fri Oct
13 09:05:20 2017 (r324582)
@@ -20,6 +20,7 @@
*/
/*
+ * Copyright 2015 Nexenta Systems, Inc. All rights reserved.
* Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2014 by Delphix. All rights reserved.
* Copyright 2016 Igor Kozhukhov <ikozhuk...@gmail.com>
@@ -872,7 +873,7 @@ unshare_one(libzfs_handle_t *hdl, const char *name, co
/* make sure libshare initialized */
if ((err = zfs_init_libshare(hdl, SA_INIT_SHARE_API)) != SA_OK) {
free(mntpt); /* don't need the copy anymore */
- return (zfs_error_fmt(hdl, EZFS_SHARENFSFAILED,
+ return (zfs_error_fmt(hdl, EZFS_UNSHARENFSFAILED,
dgettext(TEXT_DOMAIN, "cannot unshare '%s': %s"),
name, _sa_errorstr(err)));
}
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
