svn commit: r304520 - head/cddl/contrib/opensolaris/lib/libzfs/common

[Andriy Gapon]

Author: avg
Date: Sat Aug 20 09:12:01 2016
New Revision: 304520
URL: https://svnweb.freebsd.org/changeset/base/304520

Log:
  fix bug introduced in r297521, set canmount=on doesn't mount filesystem
  
  There are two cases where changing canmount should result in an action:
  - canmount is set to off for a mounted filesystem
  - canmount is set to on for an unmounted filesystem
  Before r297521 we could unmount and re-mount a filesystem when that was
  not necessary, but after r297521 we only handled the first of the above
  cases.
  
  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	Sat Aug 20 07:44:41 2016	(r304519)
+++ head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c	Sat Aug 20 09:12:01 2016	(r304520)
@@ -1630,12 +1630,17 @@ 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 to 'on' or 'noauto'.  We only use
-		 * the changelist logic to unmount when setting canmount=off.
+		 * 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.
 		 */
 		if (prop != ZFS_PROP_CANMOUNT ||
 		    (fnvpair_value_uint64(elem) == ZFS_CANMOUNT_OFF &&
-		     zfs_is_mounted(zhp, NULL))) {
+		     zfs_is_mounted(zhp, NULL)) ||
+		    (fnvpair_value_uint64(elem) == ZFS_CANMOUNT_ON &&
+		     !zfs_is_mounted(zhp, NULL))) {
 			cls[cl_idx] = changelist_gather(zhp, prop, 0, 0);
 			if (cls[cl_idx] == NULL)
 				goto error;