Commit 0bac5a26 authored by Chuck Lever's avatar Chuck Lever

NFSD: Add nfsd_file_lru_dispose_list() helper

Refactor the invariant part of nfsd_file_lru_walk_list() into a
separate helper function.
Reviewed-by: default avatarJeff Layton <jlayton@kernel.org>
Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
parent 904940e9
...@@ -451,11 +451,31 @@ nfsd_file_lru_cb(struct list_head *item, struct list_lru_one *lru, ...@@ -451,11 +451,31 @@ nfsd_file_lru_cb(struct list_head *item, struct list_lru_one *lru,
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)
...@@ -465,12 +485,7 @@ nfsd_file_lru_walk_list(struct shrink_control *sc) ...@@ -465,12 +485,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;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment