aboutsummaryrefslogtreecommitdiff
path: root/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.c
diff options
context:
space:
mode:
authorXin LI <delphij@FreeBSD.org>2010-03-16 00:50:57 +0000
committerXin LI <delphij@FreeBSD.org>2010-03-16 00:50:57 +0000
commit3d4f8e9d9d42e9d802dd92a19f091ad3426965c4 (patch)
treef19f4c0e27c4c0fa5723c0bd99a0d752d8a8ed43 /cddl/contrib/opensolaris/cmd/zfs/zfs_iter.c
parent10db393f9f25065551277988a7a14320a362d022 (diff)
downloadsrc-3d4f8e9d9d42e9d802dd92a19f091ad3426965c4.tar.gz
src-3d4f8e9d9d42e9d802dd92a19f091ad3426965c4.zip
Merge OpenSolaris revision 9396:f41cf682d0d3:
6830813 zfs list -t all fails assertion *Note that this is only a partial merge of this revision addressing only this one issue.* PR: bin/144720 Submitted by: mm Approved by: pjd Obtained from: OpenSolaris MFC after: 1 month
Notes
Notes: svn path=/head/; revision=205200
Diffstat (limited to 'cddl/contrib/opensolaris/cmd/zfs/zfs_iter.c')
-rw-r--r--cddl/contrib/opensolaris/cmd/zfs/zfs_iter.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.c b/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.c
index f0bc01e9deaf..ca5c2b232786 100644
--- a/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.c
+++ b/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.c
@@ -368,7 +368,10 @@ zfs_for_each(int argc, char **argv, int flags, zfs_type_t types,
* properties other than those listed in cb_proplist/sortcol are
* accessed.
*
- * If cb_proplist is NULL then we retain all the properties.
+ * If cb_proplist is NULL then we retain all the properties. We
+ * always retain the zoned property, which some other properties
+ * need (userquota & friends), and the createtxg property, which
+ * we need to sort snapshots.
*/
if (cb.cb_proplist && *cb.cb_proplist) {
zprop_list_t *p = *cb.cb_proplist;
@@ -388,6 +391,9 @@ zfs_for_each(int argc, char **argv, int flags, zfs_type_t types,
}
sortcol = sortcol->sc_next;
}
+
+ cb.cb_props_table[ZFS_PROP_ZONED] = B_TRUE;
+ cb.cb_props_table[ZFS_PROP_CREATETXG] = B_TRUE;
} else {
(void) memset(cb.cb_props_table, B_TRUE,
sizeof (cb.cb_props_table));