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

[Andriy Gapon]

Author: avg
Date: Thu Nov 24 10:11:09 2016
New Revision: 309096
URL: https://svnweb.freebsd.org/changeset/base/309096

Log:
  MFV r308989: 6428 set canmount=off on unmounted filesystem tries to
  unmount children
  
  This is a cosmetic and bookkeeping change as the actual change is
  already in FreeBSD.
  See r297521, r304520, r308985.

Modified:
  head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c
Directory Properties:
  head/cddl/contrib/opensolaris/   (props changed)
  head/cddl/contrib/opensolaris/lib/libzfs/   (props changed)

Modified: head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c
==============================================================================
--- head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c	Thu Nov 24 10:04:20 2016	(r309095)
+++ head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c	Thu Nov 24 10:11:09 2016	(r309096)
@@ -1620,7 +1620,7 @@ zfs_prop_set_list(zfs_handle_t *zhp, nvl
 		 */
 		if (prop != ZFS_PROP_CANMOUNT ||
 		    (fnvpair_value_uint64(elem) == ZFS_CANMOUNT_OFF &&
-		     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;