svn commit: r348583 - vendor-sys/illumos/dist/uts/common/fs/zfs vendor/illumos/dist/cmd/zdb

[Alexander Motin]

Author: mav
Date: Mon Jun  3 20:45:48 2019
New Revision: 348583
URL: https://svnweb.freebsd.org/changeset/base/348583

Log:
  9847 leaking dd_clones (DMU_OT_DSL_CLONES) objects
  
  illumos/illumos-gate at 17fb938fd6cdce3ff1bb47dafda0774f742249a3
  
  Reviewed by: George Wilson <george.wilson at delphix.com>
  Reviewed by: Serapheim Dimitropoulos <serapheim at delphix.com>
  Reviewed by: Brian Behlendorf <behlendorf1 at llnl.gov>
  Approved by: Richard Lowe <richlowe at richlowe.net>
  Author:     Matthew Ahrens <mahrens at delphix.com>

Modified:
  vendor-sys/illumos/dist/uts/common/fs/zfs/dsl_destroy.c
  vendor-sys/illumos/dist/uts/common/fs/zfs/vdev_indirect_mapping.c

Changes in other areas also in this revision:
Modified:
  vendor/illumos/dist/cmd/zdb/zdb.c

Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/dsl_destroy.c
==============================================================================
--- vendor-sys/illumos/dist/uts/common/fs/zfs/dsl_destroy.c	Mon Jun  3 20:45:32 2019	(r348582)
+++ vendor-sys/illumos/dist/uts/common/fs/zfs/dsl_destroy.c	Mon Jun  3 20:45:48 2019	(r348583)
@@ -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,

Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/vdev_indirect_mapping.c
==============================================================================
--- vendor-sys/illumos/dist/uts/common/fs/zfs/vdev_indirect_mapping.c	Mon Jun  3 20:45:32 2019	(r348582)
+++ vendor-sys/illumos/dist/uts/common/fs/zfs/vdev_indirect_mapping.c	Mon Jun  3 20:45:48 2019	(r348583)
@@ -279,7 +279,6 @@ vdev_indirect_mapping_entry_for_offset_or_next(vdev_in
 	    B_TRUE));
 }
 
-
 void
 vdev_indirect_mapping_close(vdev_indirect_mapping_t *vim)
 {