diff options
| author | George Wilson <George.Wilson@Sun.COM> | 2010-06-21 21:37:48 -0700 |
|---|---|---|
| committer | George Wilson <George.Wilson@Sun.COM> | 2010-06-21 21:37:48 -0700 |
| commit | 7448a0795bbf890c55a5c66129a0d606f02a784e (patch) | |
| tree | fa5406ac3bad4661b218830761dabb847b36687f | |
| parent | a5628610b3cb18335f49944f353e3be7b9e669f4 (diff) | |
| download | illumos-gate-7448a0795bbf890c55a5c66129a0d606f02a784e.tar.gz | |
6959651 assertion failed: ddo_total->ddo_dspace == 0, file: ../../common/fs/zfs/ddt.c, line: 460onnv_143
| -rw-r--r-- | usr/src/cmd/zdb/zdb.c | 6 | ||||
| -rw-r--r-- | usr/src/uts/common/fs/zfs/ddt.c | 3 |
2 files changed, 3 insertions, 6 deletions
diff --git a/usr/src/cmd/zdb/zdb.c b/usr/src/cmd/zdb/zdb.c index 90b19427df..31681b2d5a 100644 --- a/usr/src/cmd/zdb/zdb.c +++ b/usr/src/cmd/zdb/zdb.c @@ -695,12 +695,12 @@ dump_ddt(ddt_t *ddt, enum ddt_type type, enum ddt_class class) return; ASSERT(error == 0); - count = ddt_object_count(ddt, type, class); + if ((count = ddt_object_count(ddt, type, class)) == 0) + return; + dspace = doi.doi_physical_blocks_512 << 9; mspace = doi.doi_fill_count * doi.doi_data_block_size; - ASSERT(count != 0); /* we should have destroyed it */ - ddt_object_name(ddt, type, class, name); (void) printf("%s: %llu entries, size %llu on disk, %llu in core\n", diff --git a/usr/src/uts/common/fs/zfs/ddt.c b/usr/src/uts/common/fs/zfs/ddt.c index 56e7ae354b..7183314967 100644 --- a/usr/src/uts/common/fs/zfs/ddt.c +++ b/usr/src/uts/common/fs/zfs/ddt.c @@ -461,9 +461,6 @@ ddt_get_dedup_object_stats(spa_t *spa, ddt_object_t *ddo_total) if (ddo_total->ddo_count != 0) { ddo_total->ddo_dspace /= ddo_total->ddo_count; ddo_total->ddo_mspace /= ddo_total->ddo_count; - } else { - ASSERT(ddo_total->ddo_dspace == 0); - ASSERT(ddo_total->ddo_mspace == 0); } } |