lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

nfsd: Remove nfs4_lock_state(): setclientid, setclientid_confirm, renew

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:33 -04:00 committed by J. Bruce Fields
parent 3974552dce
commit cb86fb1428
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fs/nfsd/nfs4state.c
View File

@ -2948,7 +2948,6 @@ nfsd4_setclientid(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
if (new == NULL) if (new == NULL)
return nfserr_jukebox; return nfserr_jukebox;
/* Cases below refer to rfc 3530 section 14.2.33: */ /* Cases below refer to rfc 3530 section 14.2.33: */
nfs4_lock_state();
spin_lock(&nn->client_lock); spin_lock(&nn->client_lock);
conf = find_confirmed_client_by_name(&clname, nn); conf = find_confirmed_client_by_name(&clname, nn);
if (conf) { if (conf) {
@ -2983,7 +2982,6 @@ nfsd4_setclientid(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
status = nfs_ok; status = nfs_ok;
out: out:
spin_unlock(&nn->client_lock); spin_unlock(&nn->client_lock);
nfs4_unlock_state();
if (new) if (new)
free_client(new); free_client(new);
if (unconf) if (unconf)
@ -3006,7 +3004,6 @@ nfsd4_setclientid_confirm(struct svc_rqst *rqstp,
if (STALE_CLIENTID(clid, nn)) if (STALE_CLIENTID(clid, nn))
return nfserr_stale_clientid; return nfserr_stale_clientid;
nfs4_lock_state();
spin_lock(&nn->client_lock); spin_lock(&nn->client_lock);
conf = find_confirmed_client(clid, false, nn); conf = find_confirmed_client(clid, false, nn);
@ -3056,7 +3053,6 @@ nfsd4_setclientid_confirm(struct svc_rqst *rqstp,
spin_unlock(&nn->client_lock); spin_unlock(&nn->client_lock);
if (old) if (old)
expire_client(old); expire_client(old);
nfs4_unlock_state();
return status; return status;
} }
@ -4113,7 +4109,6 @@ nfsd4_renew(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
__be32 status; __be32 status;
struct nfsd_net *nn = net_generic(SVC_NET(rqstp), nfsd_net_id); struct nfsd_net *nn = net_generic(SVC_NET(rqstp), nfsd_net_id);
nfs4_lock_state();
dprintk("process_renew(%08x/%08x): starting\n", dprintk("process_renew(%08x/%08x): starting\n",
clid->cl_boot, clid->cl_id); clid->cl_boot, clid->cl_id);
status = lookup_clientid(clid, cstate, nn); status = lookup_clientid(clid, cstate, nn);
@ -4126,7 +4121,6 @@ nfsd4_renew(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
goto out; goto out;
status = nfs_ok; status = nfs_ok;
out: out:
nfs4_unlock_state();
return status; return status;
} }