diff options
| author | Trond Myklebust | 2014-07-30 03:34:16 +0200 |
|---|---|---|
| committer | J. Bruce Fields | 2014-07-31 20:20:10 +0200 |
| commit | 858cc57336dd98ca54dff417b55a86aa101f5fb0 (patch) | |
| tree | 6b98d0520a00279c3c1f3c45b7a5c4296d6e2a64 /fs/nfsd/nfs4state.c | |
| parent | nfsd: Add reference counting to lock stateids (diff) | |
| download | kernel-qcow2-linux-858cc57336dd98ca54dff417b55a86aa101f5fb0.tar.gz kernel-qcow2-linux-858cc57336dd98ca54dff417b55a86aa101f5fb0.tar.xz kernel-qcow2-linux-858cc57336dd98ca54dff417b55a86aa101f5fb0.zip | |
nfsd: nfsd4_locku() must reference the lock stateid
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>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'fs/nfsd/nfs4state.c')
| -rw-r--r-- | fs/nfsd/nfs4state.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index 1ddf4da0023d..4f191456d737 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) |