diff options
| author |   Jeff Layton <jlayton@kernel.org> | 2022-10-31 11:49:21 -0400 |
|---|---|---|
| committer |   Chuck Lever <chuck.lever@oracle.com> | 2022-11-01 17:27:27 -0400 |
| commit | d3aefd2b29ff5ffdeb5c06a7d3191a027a18cdb8 (patch) | |
| tree | e44556f926ebaddc20991c7e291653fd2698b0b4 /fs | |
| parent | nfsd: ensure we always call fh_verify_error tracepoint (diff) | |
| download | linux-dev-d3aefd2b29ff5ffdeb5c06a7d3191a027a18cdb8.tar.xz linux-dev-d3aefd2b29ff5ffdeb5c06a7d3191a027a18cdb8.zip | |
nfsd: fix net-namespace logic in __nfsd_file_cache_purge
If the namespace doesn't match the one in "net", then we'll continue,
but that doesn't cause another rhashtable_walk_next call, so it will
loop infinitely.
Fixes: ce502f81ba88 ("NFSD: Convert the filecache to use rhashtable")
Reported-by: Petr Vorel <pvorel@suse.cz>
Link: https://lore.kernel.org/ltp/Y1%2FP8gDAcWC%2F+VR3@pevik/
Signed-off-by: Jeff Layton <jlayton@kernel.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/nfsd/filecache.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/fs/nfsd/filecache.c b/fs/nfsd/filecache.c index 29a62db155fb..adc4e87a71d2 100644 --- a/fs/nfsd/filecache.c +++ b/fs/nfsd/filecache.c @@ -893,9 +893,8 @@ __nfsd_file_cache_purge(struct net *net) nf = rhashtable_walk_next(&iter); while (!IS_ERR_OR_NULL(nf)) { - if (net && nf->nf_net != net) - continue; - nfsd_file_unhash_and_dispose(nf, &dispose); + if (!net || nf->nf_net == net) + nfsd_file_unhash_and_dispose(nf, &dispose); nf = rhashtable_walk_next(&iter); } |