From 32a2e1ad2abb2038007716a96544284cd841e51e Mon Sep 17 00:00:00 2001 From: Andriy Gapon Date: Mon, 19 Aug 2019 07:45:39 +0000 Subject: [PATCH] MFC r350893: Allow ZVOL bookmarks to be listed recursively PR: 197821 --- cddl/contrib/opensolaris/cmd/zfs/zfs_iter.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.c b/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.c index 90815813f8c..2ee4f97248a 100644 --- a/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.c +++ b/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.c @@ -445,13 +445,13 @@ zfs_for_each(int argc, char **argv, int flags, zfs_type_t types, /* * If we're recursive, then we always allow filesystems as - * arguments. If we also are interested in snapshots, then we - * can take volumes as well. + * arguments. If we also are interested in snapshots or + * bookmarks, then we can take volumes as well. */ argtype = types; if (flags & ZFS_ITER_RECURSE) { argtype |= ZFS_TYPE_FILESYSTEM; - if (types & ZFS_TYPE_SNAPSHOT) + if (types & (ZFS_TYPE_SNAPSHOT | ZFS_TYPE_BOOKMARK)) argtype |= ZFS_TYPE_VOLUME; } -- 2.45.0