aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTrond Myklebust <trond.myklebust@primarydata.com>2014-07-30 08:27:30 -0400
committerJ. Bruce Fields <bfields@redhat.com>2014-08-05 10:55:15 -0400
commit084d4d4549d88f7a27f455f9fe8a03fd9842f5ba (patch)
tree2e8c062e719b565672632008af431a523c0645c0
parent36626a2ecfcf23530bf5439679d3a4d040d6cc0d (diff)
nfsd: Remove nfs4_lock_state(): nfsd4_delegreturn()
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com> Signed-off-by: J. Bruce Fields <bfields@redhat.com>
-rw-r--r--fs/nfsd/nfs4state.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index cde72d85991d..733e653e67b8 100644
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -4855,7 +4855,6 @@ nfsd4_delegreturn(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
4855 if ((status = fh_verify(rqstp, &cstate->current_fh, S_IFREG, 0))) 4855 if ((status = fh_verify(rqstp, &cstate->current_fh, S_IFREG, 0)))
4856 return status; 4856 return status;
4857 4857
4858 nfs4_lock_state();
4859 status = nfsd4_lookup_stateid(cstate, stateid, NFS4_DELEG_STID, &s, nn); 4858 status = nfsd4_lookup_stateid(cstate, stateid, NFS4_DELEG_STID, &s, nn);
4860 if (status) 4859 if (status)
4861 goto out; 4860 goto out;
@@ -4868,8 +4867,6 @@ nfsd4_delegreturn(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
4868put_stateid: 4867put_stateid:
4869 nfs4_put_stid(&dp->dl_stid); 4868 nfs4_put_stid(&dp->dl_stid);
4870out: 4869out:
4871 nfs4_unlock_state();
4872
4873 return status; 4870 return status;
4874} 4871}
4875 4872