From: Jeff Layton <jlayton@primarydata.com>
To: bfields@fieldses.org
Cc: linux-nfs@vger.kernel.org, hch@infradead.org,
Trond Myklebust <trond.myklebust@primarydata.com>
Subject: [PATCH v2 11/38] nfsd: nfsd4_locku() must reference the lock stateid
Date: Tue, 29 Jul 2014 16:33:54 -0400 [thread overview]
Message-ID: <1406666061-14175-12-git-send-email-jlayton@primarydata.com> (raw)
In-Reply-To: <1406666061-14175-1-git-send-email-jlayton@primarydata.com>
From: Trond Myklebust <trond.myklebust@primarydata.com>
Ensure that nfsd4_locku() keeps a reference to the lock stateid
until it is done working with it. Necessary step toward client_mutex
removal.
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
---
fs/nfsd/nfs4state.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index 21963664fbb7..65e20c4bc257 100644
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -5147,10 +5147,12 @@ nfsd4_locku(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
&stp, nn);
if (status)
goto out;
+ /* FIXME: move into nfs4_preprocess_seqid_op */
+ atomic_inc(&stp->st_stid.sc_count);
filp = find_any_file(stp->st_stid.sc_file);
if (!filp) {
status = nfserr_lock_range;
- goto out;
+ goto put_stateid;
}
file_lock = locks_alloc_lock();
if (!file_lock) {
@@ -5180,6 +5182,8 @@ nfsd4_locku(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
memcpy(&locku->lu_stateid, &stp->st_stid.sc_stateid, sizeof(stateid_t));
fput:
fput(filp);
+put_stateid:
+ nfs4_put_stid(&stp->st_stid);
out:
nfsd4_bump_seqid(cstate, status);
if (!cstate->replay_owner)
--
1.9.3
next prev parent reply other threads:[~2014-07-29 20:34 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-07-29 20:33 [PATCH v2 00/38] nfsd: stateid and stateowner refcounting overhaul Jeff Layton
2014-07-29 20:33 ` [PATCH v2 01/38] nfsd: Add reference counting to the lock and open stateids Jeff Layton
2014-07-29 20:33 ` [PATCH v2 02/38] nfsd: Cleanup the freeing of stateids Jeff Layton
2014-07-29 20:33 ` [PATCH v2 03/38] nfsd: Add a struct nfs4_file field to struct nfs4_stid Jeff Layton
2014-07-30 0:54 ` J. Bruce Fields
2014-07-30 1:28 ` Jeff Layton
2014-07-29 20:33 ` [PATCH v2 04/38] nfsd: Replace nfs4_ol_stateid->st_file with the st_stid.sc_file Jeff Layton
2014-07-29 20:33 ` [PATCH v2 05/38] nfsd4: use cl_lock to synchronize all stateid idr calls Jeff Layton
2014-07-29 20:33 ` [PATCH v2 06/38] nfsd: do filp_close in sc_free callback for lock stateids Jeff Layton
2014-07-29 20:33 ` [PATCH v2 07/38] nfsd: Add locking to protect the state owner lists Jeff Layton
2014-07-29 20:33 ` [PATCH v2 08/38] nfsd: clean up races in lock stateid searching and creation Jeff Layton
2014-07-29 20:33 ` [PATCH v2 09/38] nfsd: ensure atomicity in nfsd4_free_stateid and nfsd4_validate_stateid Jeff Layton
2014-07-29 20:33 ` [PATCH v2 10/38] nfsd: Add reference counting to lock stateids Jeff Layton
2014-07-29 20:33 ` Jeff Layton [this message]
2014-07-29 20:33 ` [PATCH v2 12/38] nfsd: Ensure that nfs4_open_delegation() references the delegation stateid Jeff Layton
2014-07-29 20:33 ` [PATCH v2 13/38] nfsd: nfsd4_process_open2() must reference " Jeff Layton
2014-07-29 20:33 ` [PATCH v2 14/38] nfsd: nfsd4_process_open2() must reference the open stateid Jeff Layton
2014-07-29 20:33 ` [PATCH v2 15/38] nfsd: Prepare nfsd4_close() for open stateid referencing Jeff Layton
2014-07-29 20:33 ` [PATCH v2 16/38] nfsd: nfsd4_open_confirm() must reference the open stateid Jeff Layton
2014-07-29 20:34 ` [PATCH v2 17/38] nfsd: Add reference counting to nfs4_preprocess_confirmed_seqid_op Jeff Layton
2014-07-29 20:34 ` [PATCH v2 18/38] nfsd: Migrate the stateid reference into nfs4_preprocess_seqid_op Jeff Layton
2014-07-29 20:34 ` [PATCH v2 19/38] nfsd: Migrate the stateid reference into nfs4_lookup_stateid() Jeff Layton
2014-07-29 20:34 ` [PATCH v2 20/38] nfsd: Migrate the stateid reference into nfs4_find_stateid_by_type() Jeff Layton
2014-07-29 20:34 ` [PATCH v2 21/38] nfsd: Add reference counting to state owners Jeff Layton
2014-07-29 20:34 ` [PATCH v2 22/38] nfsd: Add a mutex to protect the NFSv4.0 open owner replay cache Jeff Layton
2014-07-29 20:34 ` [PATCH v2 23/38] nfsd: clean up lockowner refcounting when finding them Jeff Layton
2014-07-29 20:34 ` [PATCH v2 24/38] nfsd: add an operation for unhashing a stateowner Jeff Layton
2014-07-29 20:34 ` [PATCH v2 25/38] nfsd: Make lock stateid take a reference to the lockowner Jeff Layton
2014-07-29 20:34 ` [PATCH v2 26/38] nfsd: clean up refcounting for lockowners Jeff Layton
2014-07-29 20:34 ` [PATCH v2 27/38] nfsd: make openstateids hold references to their openowners Jeff Layton
2014-07-29 20:34 ` [PATCH v2 28/38] nfsd: don't allow CLOSE to proceed until refcount on stateid drops Jeff Layton
2014-07-29 20:34 ` [PATCH v2 29/38] nfsd: Protect adding/removing open state owners using client_lock Jeff Layton
2014-07-29 20:34 ` [PATCH v2 30/38] nfsd: Protect adding/removing lock " Jeff Layton
2014-07-29 20:34 ` [PATCH v2 31/38] nfsd: Move the open owner hash table into struct nfs4_client Jeff Layton
2014-07-29 20:34 ` [PATCH v2 32/38] nfsd: clean up and reorganize release_lockowner Jeff Layton
2014-07-29 20:34 ` [PATCH v2 33/38] nfsd: add locking to stateowner release Jeff Layton
2014-07-29 20:34 ` [PATCH v2 34/38] nfsd: optimize destroy_lockowner cl_lock thrashing Jeff Layton
2014-07-29 20:34 ` [PATCH v2 35/38] nfsd: close potential race in nfsd4_free_stateid Jeff Layton
2014-07-29 20:34 ` [PATCH v2 36/38] nfsd: reduce cl_lock thrashing in release_openowner Jeff Layton
2014-07-29 20:34 ` [PATCH v2 37/38] nfsd: don't thrash the cl_lock while freeing an open stateid Jeff Layton
2014-07-29 20:34 ` [PATCH v2 38/38] nfsd: rename unhash_generic_stateid to unhash_ol_stateid Jeff Layton
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=1406666061-14175-12-git-send-email-jlayton@primarydata.com \
--to=jlayton@primarydata.com \
--cc=bfields@fieldses.org \
--cc=hch@infradead.org \
--cc=linux-nfs@vger.kernel.org \
--cc=trond.myklebust@primarydata.com \
/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).