diff options
| author | mav <mav@FreeBSD.org> | 2017-07-26 15:19:34 +0000 |
|---|---|---|
| committer | mav <mav@FreeBSD.org> | 2017-07-26 15:19:34 +0000 |
| commit | 41fea0305edc187a7126dfffa5ad0647637db2ce (patch) | |
| tree | 213162af990dded59c1a40392b96a5d2b810a4fa /cddl | |
| parent | 64530321a6d72ccf76339de5d6d6ef26344b9e2f (diff) | |
| download | FreeBSD-src-41fea0305edc187a7126dfffa5ad0647637db2ce.zip FreeBSD-src-41fea0305edc187a7126dfffa5ad0647637db2ce.tar.gz | |
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.
Diffstat (limited to 'cddl')
| -rw-r--r-- | cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c b/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c index 576e894..c013b63 100644 --- a/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c +++ b/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c @@ -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; |
