svn commit: r273349 - stable/10/cddl/contrib/opensolaris/cmd/zdb

[Xin LI]

Author: delphij
Date: Mon Oct 20 22:18:21 2014
New Revision: 273349
URL: https://svnweb.freebsd.org/changeset/base/273349

Log:
  MFC r272599: MFV r272588:
  
  Handle old format deadlist.
  
  Illumos issue:
      5178 zdb -vvvvv on old-format pool fails in dump_deadlist()

Modified:
  stable/10/cddl/contrib/opensolaris/cmd/zdb/zdb.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/cddl/contrib/opensolaris/cmd/zdb/zdb.c
==============================================================================
--- stable/10/cddl/contrib/opensolaris/cmd/zdb/zdb.c	Mon Oct 20 22:13:50 2014	(r273348)
+++ stable/10/cddl/contrib/opensolaris/cmd/zdb/zdb.c	Mon Oct 20 22:18:21 2014	(r273349)
@@ -1461,6 +1461,11 @@ dump_deadlist(dsl_deadlist_t *dl)
 	if (dump_opt['d'] < 3)
 		return;
 
+	if (dl->dl_oldfmt) {
+		dump_bpobj(&dl->dl_bpobj, "old-format deadlist", 0);
+		return;
+	}
+
 	zdb_nicenum(dl->dl_phys->dl_used, bytes);
 	zdb_nicenum(dl->dl_phys->dl_comp, comp);
 	zdb_nicenum(dl->dl_phys->dl_uncomp, uncomp);