diff options
| author | Andriy Gapon <avg@FreeBSD.org> | 2019-08-12 10:00:32 +0000 |
|---|---|---|
| committer | Andriy Gapon <avg@FreeBSD.org> | 2019-08-12 10:00:32 +0000 |
| commit | f62615062eb0387feeb7fc009f689346202e6ad6 (patch) | |
| tree | ec2caac17b4e0f0ae8b150e46030ad4e3e869b7e /cddl/contrib | |
| parent | 4687c674259e2f0504b95792d082cdec87cf3ca8 (diff) | |
| download | src-f62615062eb0387feeb7fc009f689346202e6ad6.tar.gz src-f62615062eb0387feeb7fc009f689346202e6ad6.zip | |
Allow ZVOL bookmarks to be listed recursively
Many thanks to cryx-freebsd@h3q.com for reporting the problem and
submitting a fix. I have chosen to take an equivalent but textually
different patch from ZoL just to avoid increasing divergence between
OpenZFS flavours.
ZoL commit: zfsonlinux/zfse33da554c5daf0103b093f44ab5b90ad6c064c3f
Author: loli10K <ezomori.nozomu@gmail.com>
Date: Wed Sep 7 19:34:20 2016 +0200
PR: 197821
Submitted by: cryx-freebsd@h3q.com (alternative version)
Reported by: cryx-freebsd@h3q.com
Obtained from: ZoL
MFC after: 1 week
Notes
Notes:
svn path=/head/; revision=350893
Diffstat (limited to 'cddl/contrib')
| -rw-r--r-- | cddl/contrib/opensolaris/cmd/zfs/zfs_iter.c | 6 |
1 files 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 90815813f8ce..2ee4f97248a9 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; } |