diff options
| author | Alek P <[email protected]> | 2018-10-11 00:13:13 -0400 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2018-10-10 21:13:13 -0700 |
| commit | 50a343d85c04698d51c154375a00994dea81e6db (patch) | |
| tree | 4495b175447ed0a18a8540e7eb7461bfb4d52183 /lib/libzfs/libzfs_mount.c | |
| parent | 5b3bfd86a4acd0fd572802de6eb8bfed322dd470 (diff) | |
Fix changelist mounted-dataset iteration
Commit 0c6d093 caused a regression in the inherit codepath.
The fix is to restrict the changelist iteration on mountpoints and
add proper handling for 'legacy' mountpoints
Reviewed by: Serapheim Dimitropoulos <[email protected]>
Reviewed by: Brian Behlendorf <[email protected]>
Signed-off-by: Alek Pinchuk <[email protected]>
Closes #7988
Closes #7991
Diffstat (limited to 'lib/libzfs/libzfs_mount.c')
| -rw-r--r-- | lib/libzfs/libzfs_mount.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/libzfs/libzfs_mount.c b/lib/libzfs/libzfs_mount.c index 252112e24..23e45d0d3 100644 --- a/lib/libzfs/libzfs_mount.c +++ b/lib/libzfs/libzfs_mount.c @@ -25,6 +25,7 @@ * Copyright (c) 2014, 2015 by Delphix. All rights reserved. * Copyright 2016 Igor Kozhukhov <[email protected]> * Copyright 2017 RackTop Systems. + * Copyright (c) 2018 Datto Inc. */ /* @@ -699,7 +700,8 @@ zfs_unmountall(zfs_handle_t *zhp, int flags) prop_changelist_t *clp; int ret; - clp = changelist_gather(zhp, ZFS_PROP_MOUNTPOINT, 0, flags); + clp = changelist_gather(zhp, ZFS_PROP_MOUNTPOINT, + CL_GATHER_ITER_MOUNTED, 0); if (clp == NULL) return (-1); |