6959651 assertion failed: ddo_total->ddo_dspace == 0, file: ../../common/fs/zfs/ddt.c, line: 460 onnv_143
authorGeorge Wilson <George.Wilson@Sun.COM>
Mon, 21 Jun 2010 21:37:48 -0700
changeset 12671 2fee57289adb
parent 12670 0ac66a96529d
child 12672 5b2e7f4e0c90
6959651 assertion failed: ddo_total->ddo_dspace == 0, file: ../../common/fs/zfs/ddt.c, line: 460
usr/src/cmd/zdb/zdb.c
usr/src/uts/common/fs/zfs/ddt.c
--- a/usr/src/cmd/zdb/zdb.c	Mon Jun 21 16:16:00 2010 -0700
+++ b/usr/src/cmd/zdb/zdb.c	Mon Jun 21 21:37:48 2010 -0700
@@ -695,12 +695,12 @@
 		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",
--- a/usr/src/uts/common/fs/zfs/ddt.c	Mon Jun 21 16:16:00 2010 -0700
+++ b/usr/src/uts/common/fs/zfs/ddt.c	Mon Jun 21 21:37:48 2010 -0700
@@ -461,9 +461,6 @@
 	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);
 	}
 }