diff --git a/module/zfs/dbuf.c b/module/zfs/dbuf.c
index 7b66fcea42..55326c4981 100644
--- a/module/zfs/dbuf.c
+++ b/module/zfs/dbuf.c
@@ -2319,6 +2319,10 @@ dbuf_sync_leaf(dbuf_dirty_record_t *dr, dmu_tx_t *tx)
 		ASSERT(dr->dr_next == NULL);
 		ASSERT(dr->dr_dbuf == db);
 		*drp = dr->dr_next;
+		if (dr->dr_dbuf->db_level != 0) {
+			mutex_destroy(&dr->dt.di.dr_mtx);
+			list_destroy(&dr->dt.di.dr_children);
+		}
 		kmem_free(dr, sizeof (dbuf_dirty_record_t));
 		ASSERT(db->db_dirtycnt > 0);
 		db->db_dirtycnt -= 1;
diff --git a/module/zfs/zfs_znode.c b/module/zfs/zfs_znode.c
index 018f12d966..79d8d2e7e7 100644
--- a/module/zfs/zfs_znode.c
+++ b/module/zfs/zfs_znode.c
@@ -1856,6 +1856,8 @@ zfs_create_fs(objset_t *os, cred_t *cr, nvlist_t *zplprops, dmu_tx_t *tx)
 	if (sense == ZFS_CASE_INSENSITIVE || sense == ZFS_CASE_MIXED)
 		zfsvfs.z_norm |= U8_TEXTPREP_TOUPPER;
 
+	/* XXX - This must be destroyed but I'm not quite sure yet so
+	 * I'm just annotating that fact when it's an issue.  -Brian */
 	mutex_init(&zfsvfs.z_znodes_lock, NULL, MUTEX_DEFAULT, NULL);
 	list_create(&zfsvfs.z_all_znodes, sizeof (znode_t),
 	    offsetof(znode_t, z_link_node));