diff options
| author | Alexander Stetsenko <[email protected]> | 2014-02-05 21:34:18 +0400 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2014-03-04 11:50:13 -0800 |
| commit | 36f92e93e5dcd88efd74522ac0efd237168c1dfd (patch) | |
| tree | e734b8a7941ce53b2adc19b625911b9b223f8de3 | |
| parent | 13a7ba1c2c5572391094800472f4a78899b4b843 (diff) | |
Illumos #4574 get_clones_stat does not call zap_count in non-debug kernel
4574 get_clones_stat does not call zap_count in non-debug kernel
Reviewed by: Matthew Ahrens <[email protected]>
Reviewed by: Marcel Telka <[email protected]>
Approved by: Gordon Ross <[email protected]>
References:
https://www.illumos.org/issues/4574
illumos/illumos-gate@03d1795fa6f720eafbee821ad37f4343c391cfe4
Ported-by: Richard Yao <[email protected]>
Signed-off-by: Brian Behlendorf <[email protected]>
Closes #2147
| -rw-r--r-- | module/zfs/dsl_dataset.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/module/zfs/dsl_dataset.c b/module/zfs/dsl_dataset.c index 7c4819bbc..5eb8c0199 100644 --- a/module/zfs/dsl_dataset.c +++ b/module/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> @@ -1371,7 +1372,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) |