d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cache: add missing call to cache_ncp_invalid for negative hits

Browse Source 
Note the dtrace probe can fire even the entry is gone, but I don't think that's
worth fixing.
This commit is contained in:
Mateusz Guzik 2020-07-02 12:56:20 +00:00
parent d129e0eba0
commit d23850207b
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=362889
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
sys/kern/vfs_cache.c
View File

@ -1342,7 +1342,7 @@ cache_lookup(struct vnode *dvp, struct vnode **vpp, struct componentname *cnp,
uint32_t hash;
enum vgetstate vs;
int error, ltype;
bool try_smr, doing_smr;
bool try_smr, doing_smr, whiteout;
#ifdef DEBUG_CACHE
if (__predict_false(!doingcache)) {
@ -1498,28 +1498,28 @@ cache_lookup(struct vnode *dvp, struct vnode **vpp, struct componentname *cnp,
goto zap_and_exit;
}
SDT_PROBE2(vfs, namecache, lookup, hit__negative, dvp, ncp->nc_name);
cache_out_ts(ncp, tsp, ticksp);
counter_u64_add(numneghits, 1);
whiteout = (ncp->nc_flag & NCF_WHITE);
if (doing_smr) {
if ((ncp->nc_flag & NCF_HOTNEGATIVE) == 0) {
/*
* We need to take locks to promote the entry.
*/
/*
* We need to take locks to promote an entry.
*/
if ((ncp->nc_flag & NCF_HOTNEGATIVE) == 0 ||
cache_ncp_invalid(ncp)) {
vfs_smr_exit();
doing_smr = false;
goto retry_hashed;
}
vfs_smr_exit();
} else {
cache_negative_hit(ncp);
}
counter_u64_add(numneghits, 1);
if (ncp->nc_flag & NCF_WHITE)
cnp->cn_flags |= ISWHITEOUT;
SDT_PROBE2(vfs, namecache, lookup, hit__negative, dvp,
ncp->nc_name);
cache_out_ts(ncp, tsp, ticksp);
if (doing_smr)
vfs_smr_exit();
else
cache_lookup_unlock(blp, dvlp);
}
if (whiteout)
cnp->cn_flags |= ISWHITEOUT;
return (ENOENT);
zap_and_exit: