diff options
| author | Trond Myklebust <trond.myklebust@primarydata.com> | 2014-07-30 14:27:29 +0200 |
|---|---|---|
| committer | J. Bruce Fields <bfields@redhat.com> | 2014-08-05 16:55:14 +0200 |
| commit | 36626a2ecfcf23530bf5439679d3a4d040d6cc0d (patch) | |
| tree | a94540163d339a312e78664b0cd3ef026a0798b4 /fs/nfsd | |
| parent | nfsd: Remove nfs4_lock_state(): nfsd4_lock/locku/lockt() (diff) | |
| download | linux-36626a2ecfcf23530bf5439679d3a4d040d6cc0d.tar.xz linux-36626a2ecfcf23530bf5439679d3a4d040d6cc0d.zip | |
nfsd: Remove nfs4_lock_state(): nfsd4_open_downgrade + nfsd4_close
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 | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index 2712cd3e77a0..cde72d85991d 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -4713,7 +4713,6 @@ put_stateid: nfs4_put_stid(&stp->st_stid); out: nfsd4_bump_seqid(cstate, status); - nfs4_unlock_state(); return status; } @@ -4760,7 +4759,6 @@ nfsd4_open_downgrade(struct svc_rqst *rqstp, dprintk("NFSD: %s: od_deleg_want=0x%x ignored\n", __func__, od->od_deleg_want); - nfs4_lock_state(); status = nfs4_preprocess_confirmed_seqid_op(cstate, od->od_seqid, &od->od_stateid, &stp, nn); if (status) @@ -4826,7 +4824,6 @@ nfsd4_close(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, dprintk("NFSD: nfsd4_close on file %pd\n", cstate->current_fh.fh_dentry); - nfs4_lock_state(); status = nfs4_preprocess_seqid_op(cstate, close->cl_seqid, &close->cl_stateid, NFS4_OPEN_STID|NFS4_CLOSED_STID, @@ -4842,7 +4839,6 @@ nfsd4_close(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, /* put reference from nfs4_preprocess_seqid_op */ nfs4_put_stid(&stp->st_stid); out: - nfs4_unlock_state(); return status; } |