diff options
| author | mjg <mjg@FreeBSD.org> | 2017-05-16 19:35:25 +0000 |
|---|---|---|
| committer | mjg <mjg@FreeBSD.org> | 2017-05-16 19:35:25 +0000 |
| commit | e497ab1e8b650dd72702209eae2fcd2d1631f5fd (patch) | |
| tree | dcc6c64744c09e0ca15b70cb47c80ba04766dcec /sys/kern | |
| parent | 875a71d5915ab9689d47c22c62687b4a7c0ff39a (diff) | |
| download | FreeBSD-src-e497ab1e8b650dd72702209eae2fcd2d1631f5fd.zip FreeBSD-src-e497ab1e8b650dd72702209eae2fcd2d1631f5fd.tar.gz | |
MFC r317784:
cache: stop holding the ncneg_hot lock across purging
Only non-hot entries are purged so the lock is not needed in the first place.
This saves one lock/unlock pair.
Diffstat (limited to 'sys/kern')
| -rw-r--r-- | sys/kern/vfs_cache.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/sys/kern/vfs_cache.c b/sys/kern/vfs_cache.c index 093c249..3361685 100644 --- a/sys/kern/vfs_cache.c +++ b/sys/kern/vfs_cache.c @@ -735,13 +735,12 @@ cache_negative_remove(struct namecache *ncp, bool neg_locked) list_locked = true; mtx_lock(&neglist->nl_lock); } - } else { - mtx_assert(&neglist->nl_lock, MA_OWNED); - mtx_assert(&ncneg_hot.nl_lock, MA_OWNED); } if (ncp->nc_flag & NCF_HOTNEGATIVE) { + mtx_assert(&ncneg_hot.nl_lock, MA_OWNED); TAILQ_REMOVE(&ncneg_hot.nl_list, ncp, nc_dst); } else { + mtx_assert(&neglist->nl_lock, MA_OWNED); TAILQ_REMOVE(&neglist->nl_list, ncp, nc_dst); } if (list_locked) @@ -816,7 +815,6 @@ cache_negative_zap_one(void) mtx_unlock(&ncneg_hot.nl_lock); mtx_lock(dvlp); rw_wlock(blp); - mtx_lock(&ncneg_hot.nl_lock); mtx_lock(&neglist->nl_lock); ncp2 = TAILQ_FIRST(&neglist->nl_list); if (ncp != ncp2 || dvlp != VP2VNODELOCK(ncp2->nc_dvp) || @@ -830,7 +828,6 @@ cache_negative_zap_one(void) cache_zap_locked(ncp, true); out_unlock_all: mtx_unlock(&neglist->nl_lock); - mtx_unlock(&ncneg_hot.nl_lock); rw_wunlock(blp); mtx_unlock(dvlp); out: |
