evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

nfsd: Remove nfs4_lock_state(): nfsd4_test_stateid/nfsd4_free_stateid

Browse source 
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
This commit is contained in:
Trond Myklebust 2014-07-30 08:27:26 -04:00 • committed by J. Bruce Fields
parent c2d1d6a8f0
commit e7d5dc19ce
1 changed files with 0 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
fs/nfsd/nfs4state.c
View file

@ -4532,11 +4532,9 @@ nfsd4_test_stateid(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
struct nfsd4_test_stateid_id *stateid; struct nfsd4_test_stateid_id *stateid;
struct nfs4_client *cl = cstate->session->se_client; struct nfs4_client *cl = cstate->session->se_client;
nfs4_lock_state();
list_for_each_entry(stateid, &test_stateid->ts_stateid_list, ts_id_list) list_for_each_entry(stateid, &test_stateid->ts_stateid_list, ts_id_list)
stateid->ts_id_status = stateid->ts_id_status =
nfsd4_validate_stateid(cl, &stateid->ts_id_stateid); nfsd4_validate_stateid(cl, &stateid->ts_id_stateid);
nfs4_unlock_state();
return nfs_ok; return nfs_ok;
} }
@ -4552,7 +4550,6 @@ nfsd4_free_stateid(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
struct nfs4_client *cl = cstate->session->se_client; struct nfs4_client *cl = cstate->session->se_client;
__be32 ret = nfserr_bad_stateid; __be32 ret = nfserr_bad_stateid;
nfs4_lock_state();
spin_lock(&cl->cl_lock); spin_lock(&cl->cl_lock);
s = find_stateid_locked(cl, stateid); s = find_stateid_locked(cl, stateid);
if (!s) if (!s)
@ -4593,7 +4590,6 @@ nfsd4_free_stateid(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
out_unlock: out_unlock:
spin_unlock(&cl->cl_lock); spin_unlock(&cl->cl_lock);
out: out:
nfs4_unlock_state();
return ret; return ret;
} }