Merge commit 'refs/top-bases/fix-dbuf_dirty_record_t' into fix-dbuf_dirty_record_t

Conflicts:
	module/zfs/dnode_sync.c

diff --cc module/zfs/dbuf.c
index 2fdd6b13d5d40032068c48b704a86bcd2d87bdee,42ae439972e4ce25ebd2ef38692af468bca7e0ac..6c3c853d2ccefee180de3314d963abc0166450b0
--- 1/module/zfs/dbuf.c
--- 2/module/zfs/dbuf.c
+++ b/module/zfs/dbuf.c
@@@ -2056,11 -2182,8 +2182,12 @@@ dbuf_sync_leaf(dbuf_dirty_record_t *dr
                while (*drp != dr)
                        drp = &(*drp)->dr_next;
                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 --cc module/zfs/zfs_znode.c
Simple merge