Illumos 5178 - zdb -vvvvv on old-format pool fails in dump_deadlist()

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

References:
  https://www.illumos.org/issues/5178
  https://github.com/illumos/illumos-gate/commit/90c76c6

Ported by: Turbo Fredriksson <turbo@bayour.com>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes #2713

diff --git a/cmd/zdb/zdb.c b/cmd/zdb/zdb.c
index 5f977098465033f345d8dea96d1f7236236b0a2c..fee9699db73a23e870bb638c3a627f1e89a64848 100644 (file)
--- a/cmd/zdb/zdb.c
+++ b/cmd/zdb/zdb.c
@@ -1448,6 +1448,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);