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

diff --cc module/zfs/dbuf.c
Simple merge

diff --cc module/zfs/dnode_sync.c
Simple merge

diff --cc module/zfs/zfs_znode.c
Simple merge