svn commit: r308985 - head/cddl/contrib/opensolaris/lib/libzfs/common
Andriy Gapon
avg at FreeBSD.org
Tue Nov 22 11:44:31 UTC 2016
Author: avg
Date: Tue Nov 22 11:44:30 2016
New Revision: 308985
URL: https://svnweb.freebsd.org/changeset/base/308985
Log:
revert r304520, set canmount=on is not supposed to mount the filesystem
Not sure where I got the idea that it should.
See https://github.com/openzfs/openzfs/pull/218
Reported by: mahrens
Pointyhat to: avg
MFC after: 5 days
Modified:
head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c
Modified: head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c
==============================================================================
--- head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c Tue Nov 22 11:35:29 2016 (r308984)
+++ head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c Tue Nov 22 11:44:30 2016 (r308985)
@@ -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;
More information about the svn-src-head
mailing list