d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change behavior introduced in r237119 to vendor solution

Browse Source 
References:
https://www.illumos.org/issues/2883

PR:		167905
Obtained from:	illumos (issue #2883)
MFC after:	2 weeks
This commit is contained in:
Martin Matuska 2012-07-12 06:29:54 +00:00
parent 7f6eecf580
commit 04cb23e3b1
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c
View File

@ -1484,14 +1484,17 @@ zfs_prop_set(zfs_handle_t *zhp, const char *propname, const char *propval)
}
/*
* 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.
* 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.
*/
do_prefix = !((prop == ZFS_PROP_CANMOUNT) &&
(zprop_string_to_index(prop, propval, &idx,
ZFS_TYPE_DATASET) == 0) && (idx == ZFS_CANMOUNT_NOAUTO ||
(idx == ZFS_CANMOUNT_ON && zfs_is_mounted(zhp, NULL))));
if (prop == ZFS_PROP_CANMOUNT) {
uint64_t idx;
int err = zprop_string_to_index(prop, propval, &idx,
ZFS_TYPE_DATASET);
if (err == 0 && idx != ZFS_CANMOUNT_OFF)
do_prefix = B_FALSE;
}
if (do_prefix && (ret = changelist_prefix(cl)) != 0)
goto error;