Commit 6eafb4a1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 54917c90 d3aefd2b

fs/nfsd/filecache.c

+2 −3
Original line number Original line Diff line number Diff line
@@ -893,8 +893,7 @@ __nfsd_file_cache_purge(struct net *net) 




		nf = rhashtable_walk_next(&iter);

		nf = rhashtable_walk_next(&iter);

		while (!IS_ERR_OR_NULL(nf)) {

		while (!IS_ERR_OR_NULL(nf)) {

			if (net && nf->nf_net != net)

			if (!net || nf->nf_net == net)

				continue;

				nfsd_file_unhash_and_dispose(nf, &dispose);

				nfsd_file_unhash_and_dispose(nf, &dispose);

			nf = rhashtable_walk_next(&iter);

			nf = rhashtable_walk_next(&iter);

		}

		}