Author: delphij
Date: Tue Mar 16 00:50:57 2010
New Revision: 205200
URL: http://svn.freebsd.org/changeset/base/205200
Log:
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
Modified:
head/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.c
Modified: head/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.c
==============================================================================
--- head/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.c Tue Mar 16 00:49:37
2010 (r205199)
+++ head/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.c Tue Mar 16 00:50:57
2010 (r205200)
@@ -368,7 +368,10 @@ zfs_for_each(int argc, char **argv, int
* 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
}
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));
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
