aboutsummaryrefslogtreecommitdiffstats
path: root/uts
diff options
context:
space:
mode:
authorAlexander Motin <mav@FreeBSD.org>2019-06-03 20:45:48 +0000
committerAlexander Motin <mav@FreeBSD.org>2019-06-03 20:45:48 +0000
commite3f8abf29a10267845220a08baabc7fe6f988476 (patch)
tree1566837dc7f9e2a9f513eac6deb3452faefd247c /uts
parent3705c6e18fce48f932fe6c90312453fd9bebcb56 (diff)
downloadsrc-e3f8abf29a10267845220a08baabc7fe6f988476.tar.gz
src-e3f8abf29a10267845220a08baabc7fe6f988476.zip
9847 leaking dd_clones (DMU_OT_DSL_CLONES) objects
illumos/illumos-gate@17fb938fd6cdce3ff1bb47dafda0774f742249a3 Reviewed by: George Wilson <george.wilson@delphix.com> Reviewed by: Serapheim Dimitropoulos <serapheim@delphix.com> Reviewed by: Brian Behlendorf <behlendorf1@llnl.gov> Approved by: Richard Lowe <richlowe@richlowe.net> Author: Matthew Ahrens <mahrens@delphix.com>
Notes
Notes: svn path=/vendor-sys/illumos/dist/; revision=348583
Diffstat (limited to 'uts')
-rw-r--r--uts/common/fs/zfs/dsl_destroy.c2
-rw-r--r--uts/common/fs/zfs/vdev_indirect_mapping.c1
2 files changed, 2 insertions, 1 deletions
diff --git a/uts/common/fs/zfs/dsl_destroy.c b/uts/common/fs/zfs/dsl_destroy.c
index 7183795311aa..f4eb57dd1242 100644
--- a/uts/common/fs/zfs/dsl_destroy.c
+++ b/uts/common/fs/zfs/dsl_destroy.c
@@ -786,6 +786,8 @@ dsl_dir_destroy_sync(uint64_t ddobj, dmu_tx_t *tx)
VERIFY0(zap_destroy(mos, dsl_dir_phys(dd)->dd_child_dir_zapobj, tx));
VERIFY0(zap_destroy(mos, dsl_dir_phys(dd)->dd_props_zapobj, tx));
+ if (dsl_dir_phys(dd)->dd_clones != 0)
+ VERIFY0(zap_destroy(mos, dsl_dir_phys(dd)->dd_clones, tx));
VERIFY0(dsl_deleg_destroy(mos, dsl_dir_phys(dd)->dd_deleg_zapobj, tx));
VERIFY0(zap_remove(mos,
dsl_dir_phys(dd->dd_parent)->dd_child_dir_zapobj,
diff --git a/uts/common/fs/zfs/vdev_indirect_mapping.c b/uts/common/fs/zfs/vdev_indirect_mapping.c
index 02999aae7274..1da101733e4c 100644
--- a/uts/common/fs/zfs/vdev_indirect_mapping.c
+++ b/uts/common/fs/zfs/vdev_indirect_mapping.c
@@ -279,7 +279,6 @@ vdev_indirect_mapping_entry_for_offset_or_next(vdev_indirect_mapping_t *vim,
B_TRUE));
}
-
void
vdev_indirect_mapping_close(vdev_indirect_mapping_t *vim)
{