summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordelphij <delphij@FreeBSD.org>2014-02-08 05:30:33 +0000
committerdelphij <delphij@FreeBSD.org>2014-02-08 05:30:33 +0000
commit82948eeda084eddeb4e8e513ec98cbd506d4d78a (patch)
tree6d1efc39a4e01fe66c3a87c2c89d3efb8607f56f
parent2ecd21fb09fef60549c2dfb4b404b6c82b756ced (diff)
downloadFreeBSD-src-82948eeda084eddeb4e8e513ec98cbd506d4d78a.zip
FreeBSD-src-82948eeda084eddeb4e8e513ec98cbd506d4d78a.tar.gz
4574 get_clones_stat does not call zap_count in non-debug kernel
illumos/illumos-gate@03d1795fa6f720eafbee821ad37f4343c391cfe4
-rw-r--r--uts/common/fs/zfs/dsl_dataset.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/uts/common/fs/zfs/dsl_dataset.c b/uts/common/fs/zfs/dsl_dataset.c
index 5fa408f..11c5ec8 100644
--- a/uts/common/fs/zfs/dsl_dataset.c
+++ b/uts/common/fs/zfs/dsl_dataset.c
@@ -22,6 +22,7 @@
* Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2013 by Delphix. All rights reserved.
* Copyright (c) 2012, Joyent, Inc. All rights reserved.
+ * Copyright (c) 2014 RackTop Systems.
*/
#include <sys/dmu_objset.h>
@@ -1364,7 +1365,7 @@ get_clones_stat(dsl_dataset_t *ds, nvlist_t *nv)
* Only trust it if it has the right number of entries.
*/
if (ds->ds_phys->ds_next_clones_obj != 0) {
- ASSERT0(zap_count(mos, ds->ds_phys->ds_next_clones_obj,
+ VERIFY0(zap_count(mos, ds->ds_phys->ds_next_clones_obj,
&count));
}
if (count != ds->ds_phys->ds_num_children - 1)
OpenPOWER on IntegriCloud