All of lore.kernel.org
 help / color / mirror / Atom feed
From: bjschuma@netapp.com
To: bfields@fieldses.org
Cc: linux-nfs@vger.kernel.org
Subject: [PATCH 02/10] NFSD: Lock state before calling fault injection function
Date: Mon, 17 Sep 2012 16:16:11 -0400	[thread overview]
Message-ID: <1347912979-20603-3-git-send-email-bjschuma@netapp.com> (raw)
In-Reply-To: <1347912979-20603-1-git-send-email-bjschuma@netapp.com>

From: Bryan Schumaker <bjschuma@netapp.com>

Each function touches state in some way, so getting the lock earlier
can help simplify code.

Signed-off-by: Bryan Schumaker <bjschuma@netapp.com>
---
 fs/nfsd/fault_inject.c |  2 ++
 fs/nfsd/nfs4state.c    | 18 ++----------------
 2 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/fs/nfsd/fault_inject.c b/fs/nfsd/fault_inject.c
index ae94da1..3dac486 100644
--- a/fs/nfsd/fault_inject.c
+++ b/fs/nfsd/fault_inject.c
@@ -50,7 +50,9 @@ static int nfsd_inject_set(void *op_ptr, u64 val)
 	else
 		printk(KERN_INFO "NFSD Fault Injection: %s (n = %llu)", op->file, val);
 
+	nfs4_lock_state();
 	op->func(val);
+	nfs4_unlock_state();
 	return 0;
 }
 
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index d024ffd..f7278d7 100644
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -4544,14 +4544,12 @@ void nfsd_forget_clients(u64 num)
 	struct nfs4_client *clp, *next;
 	int count = 0;
 
-	nfs4_lock_state();
 	list_for_each_entry_safe(clp, next, &client_lru, cl_lru) {
 		nfsd4_client_record_remove(clp);
 		expire_client(clp);
 		if (++count == num)
 			break;
 	}
-	nfs4_unlock_state();
 
 	printk(KERN_INFO "NFSD: Forgot %d clients", count);
 }
@@ -4586,23 +4584,13 @@ static int nfsd_release_n_owners(u64 num, bool is_open_owner,
 
 void nfsd_forget_locks(u64 num)
 {
-	int count;
-
-	nfs4_lock_state();
-	count = nfsd_release_n_owners(num, false, release_lockowner_sop);
-	nfs4_unlock_state();
-
+	int count = nfsd_release_n_owners(num, false, release_lockowner_sop);
 	printk(KERN_INFO "NFSD: Forgot %d locks", count);
 }
 
 void nfsd_forget_openowners(u64 num)
 {
-	int count;
-
-	nfs4_lock_state();
-	count = nfsd_release_n_owners(num, true, release_openowner_sop);
-	nfs4_unlock_state();
-
+	int count = nfsd_release_n_owners(num, true, release_openowner_sop);
 	printk(KERN_INFO "NFSD: Forgot %d open owners", count);
 }
 
@@ -4635,10 +4623,8 @@ void nfsd_forget_delegations(u64 num)
 	count = nfsd_process_n_delegations(num, &victims);
 	spin_unlock(&recall_lock);
 
-	nfs4_lock_state();
 	list_for_each_entry_safe(dp, dnext, &victims, dl_recall_lru)
 		unhash_delegation(dp);
-	nfs4_unlock_state();
 
 	printk(KERN_INFO "NFSD: Forgot %d delegations", count);
 }
-- 
1.7.12


  parent reply	other threads:[~2012-09-17 20:16 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-09-17 20:16 [PATCH 00/10] NFSD: Improve fault injection bjschuma
2012-09-17 20:16 ` [PATCH 01/10] NFSD: Fold fault_inject.h into state.h bjschuma
2012-09-17 20:16 ` bjschuma [this message]
2012-09-17 20:16 ` [PATCH 03/10] NFSD: Clean up forgetting clients bjschuma
2012-09-17 20:16 ` [PATCH 04/10] NFSD: Clean up forgetting locks bjschuma
2012-09-17 20:16 ` [PATCH 05/10] NFSD: Clean up forgetting openowners bjschuma
2012-09-17 20:16 ` [PATCH 06/10] NFSD: Clean up forgetting and recalling delegations bjschuma
2012-09-17 20:16 ` [PATCH 07/10] NFSD: Fault injection operations take a per-client forget function bjschuma
2012-09-17 20:16 ` [PATCH 08/10] NFSD: Reading a fault injection file prints a state count bjschuma
2012-09-17 20:16 ` [PATCH 09/10] NFSD: Add a custom file operations structure for fault injection bjschuma
2012-09-17 20:16 ` [PATCH 10/10] NFSD: Forget state for a specific client bjschuma
2012-10-03 17:47 ` [PATCH 00/10] NFSD: Improve fault injection Bryan Schumaker
2012-10-03 18:23   ` J. Bruce Fields
2012-10-03 18:24     ` 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=1347912979-20603-3-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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.