]> granicus.if.org Git - zfs/commit
Fix OpenZFS 9337 mismerge
authorGeorge Wilson <george.wilson@delphix.com>
Tue, 31 Jul 2018 21:51:15 +0000 (17:51 -0400)
committerBrian Behlendorf <behlendorf1@llnl.gov>
Thu, 2 Aug 2018 17:21:48 +0000 (10:21 -0700)
commit3d503a76e890d7711d5e906e025e092d0e244211
tree3d82659f96cc5eb86b2c86589a59e70929c4ff83
parentfd7265c646f40e364396af5014bbb83e809e124a
Fix OpenZFS 9337 mismerge

This change reintroduces logic required by OpenZFS 9577. When
OpenZFS 9337, zfs get all is slow due to uncached metadata, was
merged in it ended up removing logic required by OpenZFS 9577,
remove zfs_dbuf_evict_key, and inadvertently reintroduced the
bug that 9577 was designed to fix.

This change re-enables the "evicting" flag to dbuf_rele_and_unlock
and dnode_rele_and_unlock and updates all callers to provide the
correct parameter.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: George Wilson <george.wilson@delphix.com>
Closes #7758
include/sys/dbuf.h
include/sys/dnode.h
module/zfs/dbuf.c
module/zfs/dnode.c
module/zfs/dnode_sync.c