projects
/
platform
/
kernel
/
linux-exynos.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
36626a2
)
nfsd: Remove nfs4_lock_state(): nfsd4_delegreturn()
author
Trond Myklebust
<trond.myklebust@primarydata.com>
Wed, 30 Jul 2014 12:27:30 +0000
(08:27 -0400)
committer
J. Bruce Fields
<bfields@redhat.com>
Tue, 5 Aug 2014 14:55:15 +0000
(10:55 -0400)
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
fs/nfsd/nfs4state.c
patch
|
blob
|
history
diff --git
a/fs/nfsd/nfs4state.c
b/fs/nfsd/nfs4state.c
index
cde72d8
..
733e653
100644
(file)
--- 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;
}