MFV r268453:
Diff reduction against Illumos. MFC after: 2 weeks
This commit is contained in:
commit
ad9b19c1e8
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=268469
@ -22,7 +22,7 @@
|
||||
/*
|
||||
* Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2013, Joyent, Inc. All rights reserved.
|
||||
* Copyright (c) 2013 by Delphix. All rights reserved.
|
||||
* Copyright (c) 2011, 2014 by Delphix. All rights reserved.
|
||||
* Copyright (c) 2012 DEY Storage Systems, Inc. All rights reserved.
|
||||
* Copyright (c) 2011-2012 Pawel Jakub Dawidek <pawel@dawidek.net>.
|
||||
* All rights reserved.
|
||||
@ -3873,7 +3873,6 @@ zfs_rename(zfs_handle_t *zhp, const char *source, const char *target,
|
||||
strcmp(property, "none") == 0)) {
|
||||
flags.nounmount = B_TRUE;
|
||||
}
|
||||
|
||||
if (flags.recurse) {
|
||||
|
||||
parentname = zfs_strdup(zhp->zfs_hdl, zhp->zfs_name);
|
||||
@ -3888,8 +3887,7 @@ zfs_rename(zfs_handle_t *zhp, const char *source, const char *target,
|
||||
ret = -1;
|
||||
goto error;
|
||||
}
|
||||
|
||||
} else {
|
||||
} else if (zhp->zfs_type != ZFS_TYPE_SNAPSHOT) {
|
||||
if ((cl = changelist_gather(zhp, ZFS_PROP_NAME,
|
||||
flags.nounmount ? CL_GATHER_DONT_UNMOUNT : 0,
|
||||
flags.forceunmount ? MS_FORCE : 0)) == NULL) {
|
||||
@ -3941,23 +3939,23 @@ zfs_rename(zfs_handle_t *zhp, const char *source, const char *target,
|
||||
* On failure, we still want to remount any filesystems that
|
||||
* were previously mounted, so we don't alter the system state.
|
||||
*/
|
||||
if (!flags.recurse)
|
||||
if (cl != NULL)
|
||||
(void) changelist_postfix(cl);
|
||||
} else {
|
||||
if (!flags.recurse) {
|
||||
if (cl != NULL) {
|
||||
changelist_rename(cl, zfs_get_name(zhp), target);
|
||||
ret = changelist_postfix(cl);
|
||||
}
|
||||
}
|
||||
|
||||
error:
|
||||
if (parentname) {
|
||||
if (parentname != NULL) {
|
||||
free(parentname);
|
||||
}
|
||||
if (zhrp) {
|
||||
if (zhrp != NULL) {
|
||||
zfs_close(zhrp);
|
||||
}
|
||||
if (cl) {
|
||||
if (cl != NULL) {
|
||||
changelist_free(cl);
|
||||
}
|
||||
return (ret);
|
||||
|
@ -21,6 +21,7 @@
|
||||
|
||||
/*
|
||||
* Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2014 by Delphix. All rights reserved.
|
||||
*/
|
||||
|
||||
/*
|
||||
@ -736,16 +737,6 @@ zfs_share_proto(zfs_handle_t *zhp, zfs_share_proto_t *proto)
|
||||
if (!zfs_is_mountable(zhp, mountpoint, sizeof (mountpoint), NULL))
|
||||
return (0);
|
||||
|
||||
#ifdef sun
|
||||
if ((ret = zfs_init_libshare(hdl, SA_INIT_SHARE_API)) != SA_OK) {
|
||||
(void) zfs_error_fmt(hdl, EZFS_SHARENFSFAILED,
|
||||
dgettext(TEXT_DOMAIN, "cannot share '%s': %s"),
|
||||
zfs_get_name(zhp), _sa_errorstr != NULL ?
|
||||
_sa_errorstr(ret) : "");
|
||||
return (-1);
|
||||
}
|
||||
#endif
|
||||
|
||||
for (curr_proto = proto; *curr_proto != PROTO_END; curr_proto++) {
|
||||
/*
|
||||
* Return success if there are no share options.
|
||||
@ -756,6 +747,17 @@ zfs_share_proto(zfs_handle_t *zhp, zfs_share_proto_t *proto)
|
||||
strcmp(shareopts, "off") == 0)
|
||||
continue;
|
||||
|
||||
#ifdef illumos
|
||||
ret = zfs_init_libshare(hdl, SA_INIT_SHARE_API);
|
||||
if (ret != SA_OK) {
|
||||
(void) zfs_error_fmt(hdl, EZFS_SHARENFSFAILED,
|
||||
dgettext(TEXT_DOMAIN, "cannot share '%s': %s"),
|
||||
zfs_get_name(zhp), _sa_errorstr != NULL ?
|
||||
_sa_errorstr(ret) : "");
|
||||
return (-1);
|
||||
}
|
||||
#endif
|
||||
|
||||
/*
|
||||
* If the 'zoned' property is set, then zfs_is_mountable()
|
||||
* will have already bailed out if we are in the global zone.
|
||||
|
Loading…
Reference in New Issue
Block a user