diff options
| author | George Wilson <[email protected]> | 2018-07-31 17:51:15 -0400 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2018-08-02 10:21:48 -0700 |
| commit | 3d503a76e890d7711d5e906e025e092d0e244211 (patch) | |
| tree | 3d82659f96cc5eb86b2c86589a59e70929c4ff83 /module/zfs/dnode.c | |
| parent | fd7265c646f40e364396af5014bbb83e809e124a (diff) | |
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 <[email protected]>
Signed-off-by: George Wilson <[email protected]>
Closes #7758
Diffstat (limited to 'module/zfs/dnode.c')
| -rw-r--r-- | module/zfs/dnode.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/module/zfs/dnode.c b/module/zfs/dnode.c index 26471fda0..4e2a73383 100644 --- a/module/zfs/dnode.c +++ b/module/zfs/dnode.c @@ -1576,11 +1576,11 @@ void dnode_rele(dnode_t *dn, void *tag) { mutex_enter(&dn->dn_mtx); - dnode_rele_and_unlock(dn, tag); + dnode_rele_and_unlock(dn, tag, B_FALSE); } void -dnode_rele_and_unlock(dnode_t *dn, void *tag) +dnode_rele_and_unlock(dnode_t *dn, void *tag, boolean_t evicting) { uint64_t refs; /* Get while the hold prevents the dnode from moving. */ @@ -1612,7 +1612,7 @@ dnode_rele_and_unlock(dnode_t *dn, void *tag) * asserted anyway when the handle gets destroyed. */ mutex_enter(&db->db_mtx); - dbuf_rele_and_unlock(db, dnh); + dbuf_rele_and_unlock(db, dnh, evicting); } } |