diff options
| author | melifaro <melifaro@FreeBSD.org> | 2014-10-06 11:29:50 +0000 |
|---|---|---|
| committer | melifaro <melifaro@FreeBSD.org> | 2014-10-06 11:29:50 +0000 |
| commit | bbf0fe2f55e3258afdcf4e34c9b1b3e7022313ec (patch) | |
| tree | 854ad5abba35f75bf0897714c147006029a7ec67 /cddl | |
| parent | 6d4e1e4f7b52f1c8a619c0543a842d2c32fc4b08 (diff) | |
| parent | 1a9bf52407392314013176555802b13a04699792 (diff) | |
| download | FreeBSD-src-bbf0fe2f55e3258afdcf4e34c9b1b3e7022313ec.zip FreeBSD-src-bbf0fe2f55e3258afdcf4e34c9b1b3e7022313ec.tar.gz | |
Sync to HEAD@r272609.
Diffstat (limited to 'cddl')
| -rw-r--r-- | cddl/contrib/opensolaris/cmd/zdb/zdb.c | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/cddl/contrib/opensolaris/cmd/zdb/zdb.c b/cddl/contrib/opensolaris/cmd/zdb/zdb.c index 04970fc..b82b034 100644 --- a/cddl/contrib/opensolaris/cmd/zdb/zdb.c +++ b/cddl/contrib/opensolaris/cmd/zdb/zdb.c @@ -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); @@ -2594,10 +2599,12 @@ dump_block_stats(spa_t *spa) * all async I/Os to complete. */ if (dump_opt['c']) { - (void) zio_wait(spa->spa_async_zio_root); - spa->spa_async_zio_root = zio_root(spa, NULL, NULL, - ZIO_FLAG_CANFAIL | ZIO_FLAG_SPECULATIVE | - ZIO_FLAG_GODFATHER); + for (int i = 0; i < max_ncpus; i++) { + (void) zio_wait(spa->spa_async_zio_root[i]); + spa->spa_async_zio_root[i] = zio_root(spa, NULL, NULL, + ZIO_FLAG_CANFAIL | ZIO_FLAG_SPECULATIVE | + ZIO_FLAG_GODFATHER); + } } if (zcb.zcb_haderrors) { |
