aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTrond Myklebust <trond.myklebust@primarydata.com>2014-07-30 08:27:26 -0400
committerJ. Bruce Fields <bfields@redhat.com>2014-08-05 10:55:12 -0400
commite7d5dc19ce9800b86dd9e41ff36cc418e9da1fce (patch)
treef3cf6193f073e150b09ee3af6f2c1b18952411de
parentc2d1d6a8f096ffbd3bde2490d313d16f35ceaa1b (diff)
nfsd: Remove nfs4_lock_state(): nfsd4_test_stateid/nfsd4_free_stateid
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 3199ab50d63c..712d7e75e7dd 100644
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -4532,11 +4532,9 @@ nfsd4_test_stateid(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
4532 struct nfsd4_test_stateid_id *stateid; 4532 struct nfsd4_test_stateid_id *stateid;
4533 struct nfs4_client *cl = cstate->session->se_client; 4533 struct nfs4_client *cl = cstate->session->se_client;
4534 4534
4535 nfs4_lock_state();
4536 list_for_each_entry(stateid, &test_stateid->ts_stateid_list, ts_id_list) 4535 list_for_each_entry(stateid, &test_stateid->ts_stateid_list, ts_id_list)
4537 stateid->ts_id_status = 4536 stateid->ts_id_status =
4538 nfsd4_validate_stateid(cl, &stateid->ts_id_stateid); 4537 nfsd4_validate_stateid(cl, &stateid->ts_id_stateid);
4539 nfs4_unlock_state();
4540 4538
4541 return nfs_ok; 4539 return nfs_ok;
4542} 4540}
@@ -4552,7 +4550,6 @@ nfsd4_free_stateid(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
4552 struct nfs4_client *cl = cstate->session->se_client; 4550 struct nfs4_client *cl = cstate->session->se_client;
4553 __be32 ret = nfserr_bad_stateid; 4551 __be32 ret = nfserr_bad_stateid;
4554 4552
4555 nfs4_lock_state();
4556 spin_lock(&cl->cl_lock); 4553 spin_lock(&cl->cl_lock);
4557 s = find_stateid_locked(cl, stateid); 4554 s = find_stateid_locked(cl, stateid);
4558 if (!s) 4555 if (!s)
@@ -4593,7 +4590,6 @@ nfsd4_free_stateid(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
4593out_unlock: 4590out_unlock:
4594 spin_unlock(&cl->cl_lock); 4591 spin_unlock(&cl->cl_lock);
4595out: 4592out:
4596 nfs4_unlock_state();
4597 return ret; 4593 return ret;
4598} 4594}
4599 4595