svn commit: r272599 - head/cddl/contrib/opensolaris/cmd/zdb

[Xin LI]

Author: delphij
Date: Mon Oct  6 07:09:47 2014
New Revision: 272599
URL: https://svnweb.freebsd.org/changeset/base/272599

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

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

Modified: head/cddl/contrib/opensolaris/cmd/zdb/zdb.c
==============================================================================
--- head/cddl/contrib/opensolaris/cmd/zdb/zdb.c	Mon Oct  6 07:03:17 2014	(r272598)
+++ head/cddl/contrib/opensolaris/cmd/zdb/zdb.c	Mon Oct  6 07:09:47 2014	(r272599)
@@ -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);