Author: delphij
Date: Sat Feb 8 05:30:33 2014
New Revision: 261619
URL: http://svnweb.freebsd.org/changeset/base/261619
Log:
4574 get_clones_stat does not call zap_count in non-debug kernel
illumos/illumos-gate@03d1795fa6f720eafbee821ad37f4343c391cfe4
Modified:
vendor-sys/illumos/dist/uts/common/fs/zfs/dsl_dataset.c
Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/dsl_dataset.c
==============================================================================
--- vendor-sys/illumos/dist/uts/common/fs/zfs/dsl_dataset.c Sat Feb 8
05:17:49 2014 (r261618)
+++ vendor-sys/illumos/dist/uts/common/fs/zfs/dsl_dataset.c Sat Feb 8
05:30:33 2014 (r261619)
@@ -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, nvlis
* 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)
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
