linux-nfs.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: bjschuma@netapp.com
To: bfields@fieldses.org
Cc: linux-nfs@vger.kernel.org
Subject: [PATCH v2 03/10] NFSD: Clean up forgetting clients
Date: Tue, 30 Oct 2012 16:50:47 -0400	[thread overview]
Message-ID: <1351630254-26166-4-git-send-email-bjschuma@netapp.com> (raw)
In-Reply-To: <1351630254-26166-1-git-send-email-bjschuma@netapp.com>

From: Bryan Schumaker <bjschuma@netapp.com>

I added in a generic for-each loop that takes a pass over the client_lru
list and calls some function.  The next few patches will update other
operations to use this function as well.  A value of 0 still means "forget
everything that is found".

Signed-off-by: Bryan Schumaker <bjschuma@netapp.com>
---
 fs/nfsd/nfs4state.c | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index cf79c3b..3c5719a 100644
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -4556,18 +4556,31 @@ nfs4_check_open_reclaim(clientid_t *clid, bool sessions)
 
 #ifdef CONFIG_NFSD_FAULT_INJECTION
 
-void nfsd_forget_clients(u64 num)
+static u64 nfsd_forget_client(struct nfs4_client *clp, u64 max)
+{
+	nfsd4_client_record_remove(clp);
+	expire_client(clp);
+	return 1;
+}
+
+static u64 nfsd_for_n_state(u64 max, u64 (*func)(struct nfs4_client *, u64))
 {
 	struct nfs4_client *clp, *next;
-	int count = 0;
+	u64 count = 0;
 
 	list_for_each_entry_safe(clp, next, &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)
-- 
1.8.0


  parent reply	other threads:[~2012-10-30 20:50 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-10-30 20:50 [PATCH v2 00/10] NFSD: Improve fault injection bjschuma
2012-10-30 20:50 ` [PATCH v2 01/10] NFSD: Fold fault_inject.h into state.h bjschuma
2012-10-30 20:50 ` [PATCH v2 02/10] NFSD: Lock state before calling fault injection function bjschuma
2012-10-30 20:50 ` bjschuma [this message]
2012-10-30 20:50 ` [PATCH v2 04/10] NFSD: Clean up forgetting locks bjschuma
2012-10-30 20:50 ` [PATCH v2 05/10] NFSD: Clean up forgetting openowners bjschuma
2012-10-30 20:50 ` [PATCH v2 06/10] NFSD: Clean up forgetting and recalling delegations bjschuma
2012-10-30 20:50 ` [PATCH v2 07/10] NFSD: Fault injection operations take a per-client forget function bjschuma
2012-10-30 20:50 ` [PATCH v2 08/10] NFSD: Reading a fault injection file prints a state count bjschuma
2012-10-30 20:50 ` [PATCH v2 09/10] NFSD: Add a custom file operations structure for fault injection bjschuma
2012-10-30 20:50 ` [PATCH v2 10/10] NFSD: Forget state for a specific client bjschuma
2012-11-14 22:48 ` [PATCH v2 00/10] NFSD: Improve fault injection J. Bruce Fields
2012-11-15 14:55   ` Bryan Schumaker
2012-11-15 15:00     ` J. Bruce Fields
2012-11-26 15:17       ` Bryan Schumaker
2012-11-26 16:10         ` J. Bruce Fields
2012-11-26 16:26           ` Bryan Schumaker

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1351630254-26166-4-git-send-email-bjschuma@netapp.com \
    --to=bjschuma@netapp.com \
    --cc=bfields@fieldses.org \
    --cc=linux-nfs@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).