diff options
| author | Trond Myklebust <trond.myklebust@primarydata.com> | 2014-07-30 14:27:25 +0200 |
|---|---|---|
| committer | J. Bruce Fields <bfields@redhat.com> | 2014-08-05 16:55:11 +0200 |
| commit | c2d1d6a8f096ffbd3bde2490d313d16f35ceaa1b (patch) | |
| tree | cf53a3d1d3b4dbde7223c9944325d5a56ffa4e24 /fs/nfsd | |
| parent | nfsd: remove old fault injection infrastructure (diff) | |
| download | linux-c2d1d6a8f096ffbd3bde2490d313d16f35ceaa1b.tar.xz linux-c2d1d6a8f096ffbd3bde2490d313d16f35ceaa1b.zip | |
nfsd: Remove nfs4_lock_state(): nfs4_preprocess_stateid_op()
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 | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index 90aa953420b6..3199ab50d63c 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -4465,13 +4465,11 @@ nfs4_preprocess_stateid_op(struct net *net, struct nfsd4_compound_state *cstate, if (ZERO_STATEID(stateid) || ONE_STATEID(stateid)) return check_special_stateids(net, current_fh, stateid, flags); - nfs4_lock_state(); - status = nfsd4_lookup_stateid(cstate, stateid, NFS4_DELEG_STID|NFS4_OPEN_STID|NFS4_LOCK_STID, &s, nn); if (status) - goto unlock_state; + return status; status = check_stateid_generation(stateid, &s->sc_stateid, nfsd4_has_session(cstate)); if (status) goto out; @@ -4521,8 +4519,6 @@ nfs4_preprocess_stateid_op(struct net *net, struct nfsd4_compound_state *cstate, *filpp = file; out: nfs4_put_stid(s); -unlock_state: - nfs4_unlock_state(); return status; } |