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

cache: dedup code for negative promotion

Browse Source
This commit is contained in:
Mateusz Guzik 2020-10-16 00:55:31 +00:00
parent c97c8746c0
commit 640e6162ee
1 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
sys/kern/vfs_cache.c
View File

@ -806,6 +806,23 @@ cache_negative_init(struct namecache *ncp)
ns->neg_flag = 0;
}
static void
cache_negative_promote(struct namecache *ncp)
{
struct neglist *nl;
struct negstate *ns;
ns = NCP2NEGSTATE(ncp);
nl = NCP2NEGLIST(ncp);
mtx_assert(&nl->nl_lock, MA_OWNED);
if ((ns->neg_flag & NEG_HOT) == 0) {
TAILQ_REMOVE(&nl->nl_list, ncp, nc_dst);
TAILQ_INSERT_TAIL(&nl->nl_hotlist, ncp, nc_dst);
nl->nl_hotnum++;
ns->neg_flag |= NEG_HOT;
}
}
static void
cache_negative_hit(struct namecache *ncp)
{
@ -817,12 +834,7 @@ cache_negative_hit(struct namecache *ncp)
return;
nl = NCP2NEGLIST(ncp);
mtx_lock(&nl->nl_lock);
if ((ns->neg_flag & NEG_HOT) == 0) {
TAILQ_REMOVE(&nl->nl_list, ncp, nc_dst);
TAILQ_INSERT_TAIL(&nl->nl_hotlist, ncp, nc_dst);
nl->nl_hotnum++;
ns->neg_flag |= NEG_HOT;
}
cache_negative_promote(ncp);
mtx_unlock(&nl->nl_lock);
}
@ -3376,7 +3388,6 @@ cache_fplookup_negative_promote(struct cache_fpl *fpl, struct namecache *oncp,
struct componentname *cnp;
struct namecache *ncp;
struct neglist *nl;
struct negstate *ns;
struct vnode *dvp;
u_char nc_flag;
@ -3434,13 +3445,7 @@ cache_fplookup_negative_promote(struct cache_fpl *fpl, struct namecache *oncp,
goto out_abort;
}
ns = NCP2NEGSTATE(ncp);
if ((ns->neg_flag & NEG_HOT) == 0) {
TAILQ_REMOVE(&nl->nl_list, ncp, nc_dst);
TAILQ_INSERT_TAIL(&nl->nl_hotlist, ncp, nc_dst);
nl->nl_hotnum++;
ns->neg_flag |= NEG_HOT;
}
cache_negative_promote(ncp);
SDT_PROBE2(vfs, namecache, lookup, hit__negative, dvp, ncp->nc_name);
counter_u64_add(numneghits, 1);