Skip to content

Commit 6eafb4a

Browse files
committed
Merge tag 'nfsd-6.1-3' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux
Pull nfsd fix from Chuck Lever: - Fix a loop that occurs when using multiple net namespaces * tag 'nfsd-6.1-3' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux: nfsd: fix net-namespace logic in __nfsd_file_cache_purge
2 parents 54917c9 + d3aefd2 commit 6eafb4a

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

fs/nfsd/filecache.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -893,9 +893,8 @@ __nfsd_file_cache_purge(struct net *net)
893893

894894
nf = rhashtable_walk_next(&iter);
895895
while (!IS_ERR_OR_NULL(nf)) {
896-
if (net && nf->nf_net != net)
897-
continue;
898-
nfsd_file_unhash_and_dispose(nf, &dispose);
896+
if (!net || nf->nf_net == net)
897+
nfsd_file_unhash_and_dispose(nf, &dispose);
899898
nf = rhashtable_walk_next(&iter);
900899
}
901900

0 commit comments

Comments
 (0)