Mercurial > illumos > illumos-gate

changeset 9390:887948510f80

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
6826861 assertion failed in dsl_dataset_destroy_sync when "zfs destroy" old fs
author Chris Kirby <chris.kirby@sun.com>
date Fri, 17 Apr 2009 11:12:00 -0600
parents 750ed3471e90
children 413d0661ef33
files usr/src/uts/common/fs/zfs/dsl_dataset.c
diffstat 1 files changed, 2 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/usr/src/uts/common/fs/zfs/dsl_dataset.c	Fri Apr 17 06:26:47 2009 -0700
+++ b/usr/src/uts/common/fs/zfs/dsl_dataset.c	Fri Apr 17 11:12:00 2009 -0600
@@ -1270,8 +1270,7 @@
 		(void) zio_wait(zio);
 	}
 
-	ASSERT(!(ds->ds_phys->ds_flags & DS_FLAG_UNIQUE_ACCURATE) ||
-	    ds->ds_phys->ds_unique_bytes == 0);
+	ASSERT(!DS_UNIQUE_IS_ACCURATE(ds) || ds->ds_phys->ds_unique_bytes == 0);
 
 	if (ds->ds_prev && ds->ds_prev != ds->ds_dir->dd_pool->dp_origin_snap) {
 		/* Change our contents to that of the prev snapshot */
@@ -1662,7 +1661,7 @@
 		err = traverse_dataset(ds, ds->ds_phys->ds_prev_snap_txg,
 		    TRAVERSE_POST, kill_blkptr, &ka);
 		ASSERT3U(err, ==, 0);
-		ASSERT(spa_version(dp->dp_spa) < SPA_VERSION_UNIQUE_ACCURATE ||
+		ASSERT(!DS_UNIQUE_IS_ACCURATE(ds) ||
 		    ds->ds_phys->ds_unique_bytes == 0);
 	}