Author: avg
Date: Mon Aug 19 07:45:39 2019
New Revision: 351208
URL: https://svnweb.freebsd.org/changeset/base/351208

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

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

Modified: stable/12/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.c
==============================================================================
--- stable/12/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.c       Mon Aug 19 
07:42:09 2019        (r351207)
+++ stable/12/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.c       Mon Aug 19 
07:45:39 2019        (r351208)
@@ -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;
                }
 
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to