diff options
| author | Trond Myklebust <trond.myklebust@primarydata.com> | 2014-07-30 16:27:31 +0400 |
|---|---|---|
| committer | J. Bruce Fields <bfields@redhat.com> | 2014-08-05 18:55:16 +0400 |
| commit | 3234975f477f746c22d076ea178a79ea104b2ca7 (patch) | |
| tree | ad3958528b60d1eabe2bf04a9db38fff672278a3 /fs/nfsd | |
| parent | 084d4d4549d88f7a27f455f9fe8a03fd9842f5ba (diff) | |
| download | linux-3234975f477f746c22d076ea178a79ea104b2ca7.tar.xz | |
nfsd: Remove nfs4_lock_state(): nfsd4_open and nfsd4_open_confirm
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/nfs4proc.c | 3 | ||||
| -rw-r--r-- | fs/nfsd/nfs4state.c | 6 |
2 files changed, 0 insertions, 9 deletions
diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c index 29cf395b694e..5e0dc528a0e8 100644 --- a/fs/nfsd/nfs4proc.c +++ b/fs/nfsd/nfs4proc.c @@ -385,8 +385,6 @@ nfsd4_open(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, if (nfsd4_has_session(cstate)) copy_clientid(&open->op_clientid, cstate->session); - nfs4_lock_state(); - /* check seqid for replay. set nfs4_owner */ resp = rqstp->rq_resp; status = nfsd4_process_open1(&resp->cstate, open, nn); @@ -471,7 +469,6 @@ out: } nfsd4_cleanup_open_state(cstate, open, status); nfsd4_bump_seqid(cstate, status); - nfs4_unlock_state(); return status; } diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index 733e653e67b8..5b3452a00cb2 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -4007,9 +4007,6 @@ static void nfsd4_deleg_xgrade_none_ext(struct nfsd4_open *open, */ } -/* - * called with nfs4_lock_state() held. - */ __be32 nfsd4_process_open2(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_open *open) { @@ -4690,8 +4687,6 @@ nfsd4_open_confirm(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, if (status) return status; - nfs4_lock_state(); - status = nfs4_preprocess_seqid_op(cstate, oc->oc_seqid, &oc->oc_req_stateid, NFS4_OPEN_STID, &stp, nn); @@ -4785,7 +4780,6 @@ put_stateid: nfs4_put_stid(&stp->st_stid); out: nfsd4_bump_seqid(cstate, status); - nfs4_unlock_state(); return status; } |