Author: avg
Date: Wed Dec 14 16:10:58 2016
New Revision: 310068
URL: https://svnweb.freebsd.org/changeset/base/310068
Log:
MFC r308985: revert r304520, set canmount=on is not supposed to mount
the filesystem
Modified:
stable/11/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c
==============================================================================
--- stable/11/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c
Wed Dec 14 16:08:35 2016 (r310067)
+++ stable/11/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c
Wed Dec 14 16:10:58 2016 (r310068)
@@ -1615,17 +1615,12 @@ zfs_prop_set_list(zfs_handle_t *zhp, nvl
assert(cl_idx < nvl_len);
/*
* We don't want to unmount & remount the dataset when changing
- * its canmount property. We only use the changelist logic to
- * unmount when setting canmount=off for a mounted filesystem
- * or when setting canmount=on for an unmounted filesystem.
- * For all other changes to canmount property the filesystem
- * remains the same.
+ * its canmount property to 'on' or 'noauto'. We only use
+ * the changelist logic to unmount when setting canmount=off.
*/
if (prop != ZFS_PROP_CANMOUNT ||
(fnvpair_value_uint64(elem) == ZFS_CANMOUNT_OFF &&
- zfs_is_mounted(zhp, NULL)) ||
- (fnvpair_value_uint64(elem) == ZFS_CANMOUNT_ON &&
- !zfs_is_mounted(zhp, NULL))) {
+ zfs_is_mounted(zhp, NULL))) {
cls[cl_idx] = changelist_gather(zhp, prop, 0, 0);
if (cls[cl_idx] == NULL)
goto error;
_______________________________________________
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"
