Author: mav
Date: Wed Jul 26 15:19:34 2017
New Revision: 321522
URL: https://svnweb.freebsd.org/changeset/base/321522
Log:
MFC r309096 (by avg): 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:
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 Jul 26 15:15:20 2017 (r321521)
+++ stable/11/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c
Wed Jul 26 15:19:34 2017 (r321522)
@@ -1620,7 +1620,7 @@ zfs_prop_set_list(zfs_handle_t *zhp, nvlist_t *props)
*/
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;
_______________________________________________
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"
