diff options
| author | delphij <delphij@FreeBSD.org> | 2014-02-08 05:35:36 +0000 |
|---|---|---|
| committer | delphij <delphij@FreeBSD.org> | 2014-02-08 05:35:36 +0000 |
| commit | 1dfe96a0666d48596f1932917c8135ad1f3c69c7 (patch) | |
| tree | 06ac9a09e6f179904dc9b86f615e2199d02abe76 /sys/cddl | |
| parent | 47f8d13b54f11a2ffe3a9787d70032524f6c94de (diff) | |
| download | FreeBSD-src-1dfe96a0666d48596f1932917c8135ad1f3c69c7.zip FreeBSD-src-1dfe96a0666d48596f1932917c8135ad1f3c69c7.tar.gz | |
MFV r261619:
4574 get_clones_stat does not call zap_count in non-debug kernel
zap_count(...) is never called in non-DEBUG kernel.
As result "count" variable is always 0, and "goto fail" is always
reached. This means get_clones_stat function never makes up list
of clones for "clones" properties.
MFC after: 2 weeks
Diffstat (limited to 'sys/cddl')
| -rw-r--r-- | sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c index 9696ce9..6efbfb7 100644 --- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c +++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c @@ -20,9 +20,10 @@ */ /* * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. + * Portions Copyright (c) 2011 Martin Matuska <mm@FreeBSD.org> * Copyright (c) 2013 by Delphix. All rights reserved. * Copyright (c) 2012, Joyent, Inc. All rights reserved. - * Portions Copyright (c) 2011 Martin Matuska <mm@FreeBSD.org> + * Copyright (c) 2014 RackTop Systems. */ #include <sys/dmu_objset.h> @@ -1424,7 +1425,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) |
