aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTrond Myklebust <trond.myklebust@primarydata.com>2014-07-30 08:27:29 -0400
committerJ. Bruce Fields <bfields@redhat.com>2014-08-05 10:55:14 -0400
commit36626a2ecfcf23530bf5439679d3a4d040d6cc0d (patch)
treea94540163d339a312e78664b0cd3ef026a0798b4
parent2dd7f2ad4e34a3487e071ad3ef88b0a1ae7a97f2 (diff)
nfsd: Remove nfs4_lock_state(): nfsd4_open_downgrade + nfsd4_close
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com> Signed-off-by: J. Bruce Fields <bfields@redhat.com>
-rw-r--r--fs/nfsd/nfs4state.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index 2712cd3e77a0..cde72d85991d 100644
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -4713,7 +4713,6 @@ put_stateid:
4713 nfs4_put_stid(&stp->st_stid); 4713 nfs4_put_stid(&stp->st_stid);
4714out: 4714out:
4715 nfsd4_bump_seqid(cstate, status); 4715 nfsd4_bump_seqid(cstate, status);
4716 nfs4_unlock_state();
4717 return status; 4716 return status;
4718} 4717}
4719 4718
@@ -4760,7 +4759,6 @@ nfsd4_open_downgrade(struct svc_rqst *rqstp,
4760 dprintk("NFSD: %s: od_deleg_want=0x%x ignored\n", __func__, 4759 dprintk("NFSD: %s: od_deleg_want=0x%x ignored\n", __func__,
4761 od->od_deleg_want); 4760 od->od_deleg_want);
4762 4761
4763 nfs4_lock_state();
4764 status = nfs4_preprocess_confirmed_seqid_op(cstate, od->od_seqid, 4762 status = nfs4_preprocess_confirmed_seqid_op(cstate, od->od_seqid,
4765 &od->od_stateid, &stp, nn); 4763 &od->od_stateid, &stp, nn);
4766 if (status) 4764 if (status)
@@ -4826,7 +4824,6 @@ nfsd4_close(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
4826 dprintk("NFSD: nfsd4_close on file %pd\n", 4824 dprintk("NFSD: nfsd4_close on file %pd\n",
4827 cstate->current_fh.fh_dentry); 4825 cstate->current_fh.fh_dentry);
4828 4826
4829 nfs4_lock_state();
4830 status = nfs4_preprocess_seqid_op(cstate, close->cl_seqid, 4827 status = nfs4_preprocess_seqid_op(cstate, close->cl_seqid,
4831 &close->cl_stateid, 4828 &close->cl_stateid,
4832 NFS4_OPEN_STID|NFS4_CLOSED_STID, 4829 NFS4_OPEN_STID|NFS4_CLOSED_STID,
@@ -4842,7 +4839,6 @@ nfsd4_close(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
4842 /* put reference from nfs4_preprocess_seqid_op */ 4839 /* put reference from nfs4_preprocess_seqid_op */
4843 nfs4_put_stid(&stp->st_stid); 4840 nfs4_put_stid(&stp->st_stid);
4844out: 4841out:
4845 nfs4_unlock_state();
4846 return status; 4842 return status;
4847} 4843}
4848 4844