Author: mm
Date: Fri Jun 15 07:38:21 2012
New Revision: 237119
URL: http://svn.freebsd.org/changeset/base/237119
Log:
Do not remount ZFS dataset if changing canmount property to "on" and
dataset is already mounted.
PR: 167905
Submitted by: Bryan Drewery <br...@shatow.net>
MFC after: 1 week
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 Fri Jun
15 07:26:39 2012 (r237118)
+++ head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c Fri Jun
15 07:38:21 2012 (r237119)
@@ -1485,11 +1485,13 @@ zfs_prop_set(zfs_handle_t *zhp, const ch
/*
* If the dataset's canmount property is being set to noauto,
+ * or being set to on and the dataset is already mounted,
* then we want to prevent unmounting & remounting it.
*/
do_prefix = !((prop == ZFS_PROP_CANMOUNT) &&
(zprop_string_to_index(prop, propval, &idx,
- ZFS_TYPE_DATASET) == 0) && (idx == ZFS_CANMOUNT_NOAUTO));
+ ZFS_TYPE_DATASET) == 0) && (idx == ZFS_CANMOUNT_NOAUTO ||
+ (idx == ZFS_CANMOUNT_ON && zfs_is_mounted(zhp, NULL))));
if (do_prefix && (ret = changelist_prefix(cl)) != 0)
goto error;
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
