svn commit: r351209 - stable/11/cddl/contrib/opensolaris/cmd/zfs

[Andriy Gapon]

Author: avg
Date: Mon Aug 19 07:47:09 2019
New Revision: 351209
URL: https://svnweb.freebsd.org/changeset/base/351209

Log:
  MFC r350893: Allow ZVOL bookmarks to be listed recursively
  
  PR:		197821

Modified:
  stable/11/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.c
==============================================================================
--- stable/11/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.c	Mon Aug 19 07:45:39 2019	(r351208)
+++ stable/11/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.c	Mon Aug 19 07:47:09 2019	(r351209)
@@ -445,13 +445,13 @@ zfs_for_each(int argc, char **argv, int flags, zfs_typ
 
 		/*
 		 * 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;
 		}