diff options
author | kib <kib@FreeBSD.org> | 2014-01-03 20:02:30 +0000 |
---|---|---|
committer | kib <kib@FreeBSD.org> | 2014-01-03 20:02:30 +0000 |
commit | cb147dc4e3f751c2d5de7d56484c31297f62a277 (patch) | |
tree | 560dad9eebed096f70f55ea991b286ae01e5f748 /sys/kern | |
parent | 9a82e509569ff74c1002158301932901028fffe7 (diff) | |
download | FreeBSD-src-cb147dc4e3f751c2d5de7d56484c31297f62a277.zip FreeBSD-src-cb147dc4e3f751c2d5de7d56484c31297f62a277.tar.gz |
MFC r259953:
Fix accounting for the negative cache entries when reusing v_cache_dd.
Diffstat (limited to 'sys/kern')
-rw-r--r-- | sys/kern/vfs_cache.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/sys/kern/vfs_cache.c b/sys/kern/vfs_cache.c index 31ed545..e6802d4 100644 --- a/sys/kern/vfs_cache.c +++ b/sys/kern/vfs_cache.c @@ -749,16 +749,20 @@ cache_enter_time(dvp, vp, cnp, tsp, dtsp) ncp->nc_flag & NCF_ISDOTDOT) { KASSERT(ncp->nc_dvp == dvp, ("wrong isdotdot parent")); - if (ncp->nc_vp != NULL) + if (ncp->nc_vp != NULL) { TAILQ_REMOVE(&ncp->nc_vp->v_cache_dst, ncp, nc_dst); - else + } else { TAILQ_REMOVE(&ncneg, ncp, nc_dst); - if (vp != NULL) + numneg--; + } + if (vp != NULL) { TAILQ_INSERT_HEAD(&vp->v_cache_dst, ncp, nc_dst); - else + } else { TAILQ_INSERT_TAIL(&ncneg, ncp, nc_dst); + numneg++; + } ncp->nc_vp = vp; CACHE_WUNLOCK(); return; @@ -894,6 +898,8 @@ cache_enter_time(dvp, vp, cnp, tsp, dtsp) } if (numneg * ncnegfactor > numcache) { ncp = TAILQ_FIRST(&ncneg); + KASSERT(ncp->nc_vp == NULL, ("ncp %p vp %p on ncneg", + ncp, ncp->nc_vp)); zap = 1; } if (hold) |