diff options
| author | Trond Myklebust <trond.myklebust@primarydata.com> | 2014-07-30 08:27:28 -0400 |
|---|---|---|
| committer | J. Bruce Fields <bfields@redhat.com> | 2014-08-05 10:55:13 -0400 |
| commit | 2dd7f2ad4e34a3487e071ad3ef88b0a1ae7a97f2 (patch) | |
| tree | b030173365e043425c8b1a1526af35921bdc13dc /fs/nfsd | |
| parent | 51f5e78355db2e9b4d5d9093f83be3567178d236 (diff) | |
| download | op-kernel-dev-2dd7f2ad4e34a3487e071ad3ef88b0a1ae7a97f2.zip op-kernel-dev-2dd7f2ad4e34a3487e071ad3ef88b0a1ae7a97f2.tar.gz | |
nfsd: Remove nfs4_lock_state(): nfsd4_lock/locku/lockt()
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'fs/nfsd')
| -rw-r--r-- | fs/nfsd/nfs4state.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index 0f9e842..2712cd3 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -5205,8 +5205,6 @@ nfsd4_lock(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, return status; } - nfs4_lock_state(); - if (lock->lk_is_new) { if (nfsd4_has_session(cstate)) /* See rfc 5661 18.10.3: given clientid is ignored: */ @@ -5349,7 +5347,6 @@ out: if (open_stp) nfs4_put_stid(&open_stp->st_stid); nfsd4_bump_seqid(cstate, status); - nfs4_unlock_state(); if (file_lock) locks_free_lock(file_lock); if (conflock) @@ -5392,8 +5389,6 @@ nfsd4_lockt(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, if (check_lock_length(lockt->lt_offset, lockt->lt_length)) return nfserr_inval; - nfs4_lock_state(); - if (!nfsd4_has_session(cstate)) { status = lookup_clientid(&lockt->lt_clientid, cstate, nn); if (status) @@ -5448,7 +5443,6 @@ nfsd4_lockt(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, out: if (lo) nfs4_put_stateowner(&lo->lo_owner); - nfs4_unlock_state(); if (file_lock) locks_free_lock(file_lock); return status; @@ -5472,8 +5466,6 @@ nfsd4_locku(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, if (check_lock_length(locku->lu_offset, locku->lu_length)) return nfserr_inval; - nfs4_lock_state(); - status = nfs4_preprocess_seqid_op(cstate, locku->lu_seqid, &locku->lu_stateid, NFS4_LOCK_STID, &stp, nn); @@ -5516,7 +5508,6 @@ put_stateid: nfs4_put_stid(&stp->st_stid); out: nfsd4_bump_seqid(cstate, status); - nfs4_unlock_state(); if (file_lock) locks_free_lock(file_lock); return status; |
