From c9e57d01f5538a51468ee47d677d536b8c460f8e Mon Sep 17 00:00:00 2001
From: Bryan Schumaker <bjschuma@netapp.com>
Date: Thu, 29 Nov 2012 11:40:39 -0500
Subject: [PATCH] --- yaml --- r: 347693 b: refs/heads/master c:
 44e34da60b24ca14666534b61cc9579aa4e1eac5 h: refs/heads/master i:   347691:
 bc65c818ac1972de0cca2e3ccf72bec1b325ba46 v: v3

---
 [refs]                    |  2 +-
 trunk/fs/nfsd/netns.h     |  3 +++
 trunk/fs/nfsd/nfs4state.c | 25 ++++++++++++++++++++-----
 3 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 1c9a3d15e6be..58f1a4a8f3e9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 043958395a6b91863046b0cd7cae9c67fa845144
+refs/heads/master: 44e34da60b24ca14666534b61cc9579aa4e1eac5
diff --git a/trunk/fs/nfsd/netns.h b/trunk/fs/nfsd/netns.h
index 2c4b2e2896dd..964b5542f027 100644
--- a/trunk/fs/nfsd/netns.h
+++ b/trunk/fs/nfsd/netns.h
@@ -92,5 +92,8 @@ struct nfsd_net {
 	time_t nfsd4_grace;
 };
 
+/* Simple check to find out if a given net was properly initialized */
+#define nfsd_netns_ready(nn) ((nn)->sessionid_hashtbl)
+
 extern int nfsd_net_id;
 #endif /* __NFSD_NETNS_H__ */
diff --git a/trunk/fs/nfsd/nfs4state.c b/trunk/fs/nfsd/nfs4state.c
index 8e19c692649c..2478c8996bda 100644
--- a/trunk/fs/nfsd/nfs4state.c
+++ b/trunk/fs/nfsd/nfs4state.c
@@ -4605,19 +4605,34 @@ nfs4_check_open_reclaim(clientid_t *clid, bool sessions, struct nfsd_net *nn)
 
 #ifdef CONFIG_NFSD_FAULT_INJECTION
 
-void nfsd_forget_clients(u64 num)
+u64 nfsd_forget_client(struct nfs4_client *clp, u64 max)
+{
+	expire_client(clp);
+	return 1;
+}
+
+u64 nfsd_for_n_state(u64 max, u64 (*func)(struct nfs4_client *, u64))
 {
 	struct nfs4_client *clp, *next;
-	int count = 0;
+	u64 count = 0;
 	struct nfsd_net *nn = net_generic(current->nsproxy->net_ns, nfsd_net_id);
 
+	if (!nfsd_netns_ready(nn))
+		return 0;
+
 	list_for_each_entry_safe(clp, next, &nn->client_lru, cl_lru) {
-		expire_client(clp);
-		if (++count == num)
+		count += func(clp, max - count);
+		if ((max != 0) && (count >= max))
 			break;
 	}
 
-	printk(KERN_INFO "NFSD: Forgot %d clients", count);
+	return count;
+}
+
+void nfsd_forget_clients(u64 num)
+{
+	u64 count = nfsd_for_n_state(num, nfsd_forget_client);
+	printk(KERN_INFO "NFSD: Forgot %llu clients", count);
 }
 
 static void release_lockowner_sop(struct nfs4_stateowner *sop)