summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTrond Myklebust <trond.myklebust@primarydata.com>2014-07-30 14:27:30 +0200
committerJ. Bruce Fields <bfields@redhat.com>2014-08-05 16:55:15 +0200
commit084d4d4549d88f7a27f455f9fe8a03fd9842f5ba (patch)
tree2e8c062e719b565672632008af431a523c0645c0
parentnfsd: Remove nfs4_lock_state(): nfsd4_open_downgrade + nfsd4_close (diff)
downloadlinux-084d4d4549d88f7a27f455f9fe8a03fd9842f5ba.tar.xz
linux-084d4d4549d88f7a27f455f9fe8a03fd9842f5ba.zip
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,
if ((status = fh_verify(rqstp, &cstate->current_fh, S_IFREG, 0)))
return status;
- nfs4_lock_state();
status = nfsd4_lookup_stateid(cstate, stateid, NFS4_DELEG_STID, &s, nn);
if (status)
goto out;
@@ -4868,8 +4867,6 @@ nfsd4_delegreturn(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
put_stateid:
nfs4_put_stid(&dp->dl_stid);
out:
- nfs4_unlock_state();
-
return status;
}