commit 20673406534176ead9b984a84b662928110f77b1
author Trond Myklebust <Trond.Myklebust@netapp.com> Thu May 13 12:51:06 2010 -0400
committer Trond Myklebust <Trond.Myklebust@netapp.com> Fri May 14 15:09:35 2010 -0400
tree 4d3a48c79f012af1caea39cc2c8c2b1e0c132911
parent 93a05e65c090dda9cbd79d0cf57b65c4dbd8da55

SUNRPC: Ensure rpcauth_prune_expired() respects the nr_to_scan parameter

Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>

net/sunrpc/auth.c

diff --git a/net/sunrpc/auth.c b/net/sunrpc/auth.c
index c40856f..73affb8 100644
--- a/net/sunrpc/auth.c
+++ b/net/sunrpc/auth.c
@@ -236,6 +236,8 @@
 
 	list_for_each_entry_safe(cred, next, &cred_unused, cr_lru) {
 
+		if (nr_to_scan-- == 0)
+			break;
 		/*
 		 * Enforce a 60 second garbage collection moratorium
 		 * Note that the cred_unused list must be time-ordered.
@@ -255,11 +257,8 @@
 			get_rpccred(cred);
 			list_add_tail(&cred->cr_lru, free);
 			rpcauth_unhash_cred_locked(cred);
-			nr_to_scan--;
 		}
 		spin_unlock(cache_lock);
-		if (nr_to_scan == 0)
-			break;
 	}
 	return (number_cred_unused / 100) * sysctl_vfs_cache_pressure;
 }