svn commit: r272588 - vendor/illumos/dist/cmd/zdb

[Xin LI]

Author: delphij
Date: Mon Oct  6 06:00:50 2014
New Revision: 272588
URL: https://svnweb.freebsd.org/changeset/base/272588

Log:
  5178 zdb -vvvvv on old-format pool fails in dump_deadlist()
  Reviewed by: Christopher Siden <christopher.siden at delphix.com>
  Reviewed by: George Wilson <george.wilson at delphix.com>
  Reviewed by: Richard Lowe <richlowe at richlowe.net>
  Reviewed by: Saso Kiselkov <skiselkov.ml at gmail.com>
  Reviewed by: Richard Elling <richard.elling at gmail.com>
  Reviewed by: Alek Pinchuk <alek.pinchuk at nexenta.com>
  Approved by: Garrett D'Amore <garrett at damore.org>
  Author: Matthew Ahrens <mahrens at delphix.com>
  
  illumos/illumos-gate at 90c76c66a2e21307c5370ae1bd3c7145a60c874f

Modified:
  vendor/illumos/dist/cmd/zdb/zdb.c

Modified: vendor/illumos/dist/cmd/zdb/zdb.c
==============================================================================
--- vendor/illumos/dist/cmd/zdb/zdb.c	Mon Oct  6 06:00:06 2014	(r272587)
+++ vendor/illumos/dist/cmd/zdb/zdb.c	Mon Oct  6 06:00:50 2014	(r272588)
@@ -1434,6 +1434,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);