Ksawlii/kernel_samsung_a53x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

NFSD: Add nfsd_file_lru_dispose_list() helper

Browse source 
[ Upstream commit 0bac5a264d9a923f5b01f3521e1519a8d0358342 ]

Refactor the invariant part of nfsd_file_lru_walk_list() into a
separate helper function.

Reviewed-by: Jeff Layton <jlayton@kernel.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Chuck Lever 2022-07-08 14:24:18 -04:00 • committed by Ksawlii
parent 8a559507dc
commit 2103e0252c
1 changed files with 22 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
fs/nfsd/filecache.c
View file

@ -450,11 +450,31 @@ out_skip:
return LRU_SKIP; return LRU_SKIP;
} }
/*
* Unhash items on @dispose immediately, then queue them on the
* disposal workqueue to finish releasing them in the background.
*
* cel: Note that between the time list_lru_shrink_walk runs and
* now, these items are in the hash table but marked unhashed.
* Why release these outside of lru_cb ? There's no lock ordering
* problem since lru_cb currently takes no lock.
*/
static void nfsd_file_gc_dispose_list(struct list_head *dispose)
{
struct nfsd_file *nf;
list_for_each_entry(nf, dispose, nf_lru) {
spin_lock(&nfsd_file_hashtbl[nf->nf_hashval].nfb_lock);
nfsd_file_do_unhash(nf);
spin_unlock(&nfsd_file_hashtbl[nf->nf_hashval].nfb_lock);
}
nfsd_file_dispose_list_delayed(dispose);
}
static unsigned long static unsigned long
nfsd_file_lru_walk_list(struct shrink_control *sc) nfsd_file_lru_walk_list(struct shrink_control *sc)
{ {
LIST_HEAD(head); LIST_HEAD(head);
struct nfsd_file *nf;
unsigned long ret; unsigned long ret;
if (sc) if (sc)
@ -464,12 +484,7 @@ nfsd_file_lru_walk_list(struct shrink_control *sc)
ret = list_lru_walk(&nfsd_file_lru, ret = list_lru_walk(&nfsd_file_lru,
nfsd_file_lru_cb, nfsd_file_lru_cb,
&head, LONG_MAX); &head, LONG_MAX);
list_for_each_entry(nf, &head, nf_lru) { nfsd_file_gc_dispose_list(&head);
spin_lock(&nfsd_file_hashtbl[nf->nf_hashval].nfb_lock);
nfsd_file_do_unhash(nf);
spin_unlock(&nfsd_file_hashtbl[nf->nf_hashval].nfb_lock);
}
nfsd_file_dispose_list_delayed(&head);
return ret; return ret;
} }