From: bjschuma@netapp.com
To: bfields@fieldses.org
Cc: linux-nfs@vger.kernel.org
Subject: [PATCH v2 02/10] NFSD: Lock state before calling fault injection function
Date: Tue, 30 Oct 2012 16:50:46 -0400 [thread overview]
Message-ID: <1351630254-26166-3-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>
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 0278112..4b385a1 100644
--- a/fs/nfsd/fault_inject.c
+++ b/fs/nfsd/fault_inject.c
@@ -51,7 +51,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 14c3b70..cf79c3b 100644
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -4561,13 +4561,11 @@ 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) {
expire_client(clp);
if (++count == num)
break;
}
- nfs4_unlock_state();
printk(KERN_INFO "NFSD: Forgot %d clients", count);
}
@@ -4602,23 +4600,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);
}
@@ -4651,10 +4639,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.8.0
next prev 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 ` bjschuma [this message]
2012-10-30 20:50 ` [PATCH v2 03/10] NFSD: Clean up forgetting clients bjschuma
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-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 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).