Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

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 <mahrens@delphix.com>
Reviewed by: Marcel Telka <marcel@telka.sk>
Approved by: Gordon Ross <gwr@nexenta.com>

References:
  https://www.illumos.org/issues/4574
  illumos/illumos-gate@03d1795fa6

Ported-by: Richard Yao <ryao@gentoo.org>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes #2147
This commit is contained in:
Alexander Stetsenko 2014-02-05 21:34:18 +04:00 committed by Brian Behlendorf
parent 13a7ba1c2c
commit 36f92e93e5
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
module/zfs/dsl_dataset.c
View File

@ -22,6 +22,7 @@
* Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2013 by Delphix. All rights reserved. * Copyright (c) 2013 by Delphix. All rights reserved.
* Copyright (c) 2012, Joyent, Inc. All rights reserved. * Copyright (c) 2012, Joyent, Inc. All rights reserved.
* Copyright (c) 2014 RackTop Systems.
*/ */
#include <sys/dmu_objset.h> #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. * Only trust it if it has the right number of entries.
*/ */
if (ds->ds_phys->ds_next_clones_obj != 0) { 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)); &count));
} }
if (count != ds->ds_phys->ds_num_children - 1) if (count != ds->ds_phys->ds_num_children - 1)