Skip to content

Commit

Permalink
nfsd: Remove nfs4_lock_state(): setclientid, setclientid_confirm, renew
Browse files Browse the repository at this point in the history
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
  • Loading branch information
Trond Myklebust authored and J. Bruce Fields committed Aug 5, 2014
1 parent 3974552 commit cb86fb1
Showing 1 changed file with 0 additions and 6 deletions.
6 changes: 0 additions & 6 deletions fs/nfsd/nfs4state.c
Original file line number Diff line number Diff line change
Expand Up @@ -2948,7 +2948,6 @@ nfsd4_setclientid(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
if (new == NULL)
return nfserr_jukebox;
/* Cases below refer to rfc 3530 section 14.2.33: */
nfs4_lock_state();
spin_lock(&nn->client_lock);
conf = find_confirmed_client_by_name(&clname, nn);
if (conf) {
Expand Down Expand Up @@ -2983,7 +2982,6 @@ nfsd4_setclientid(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
status = nfs_ok;
out:
spin_unlock(&nn->client_lock);
nfs4_unlock_state();
if (new)
free_client(new);
if (unconf)
Expand All @@ -3006,7 +3004,6 @@ nfsd4_setclientid_confirm(struct svc_rqst *rqstp,

if (STALE_CLIENTID(clid, nn))
return nfserr_stale_clientid;
nfs4_lock_state();

spin_lock(&nn->client_lock);
conf = find_confirmed_client(clid, false, nn);
Expand Down Expand Up @@ -3056,7 +3053,6 @@ nfsd4_setclientid_confirm(struct svc_rqst *rqstp,
spin_unlock(&nn->client_lock);
if (old)
expire_client(old);
nfs4_unlock_state();
return status;
}

Expand Down Expand Up @@ -4113,7 +4109,6 @@ nfsd4_renew(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
__be32 status;
struct nfsd_net *nn = net_generic(SVC_NET(rqstp), nfsd_net_id);

nfs4_lock_state();
dprintk("process_renew(%08x/%08x): starting\n",
clid->cl_boot, clid->cl_id);
status = lookup_clientid(clid, cstate, nn);
Expand All @@ -4126,7 +4121,6 @@ nfsd4_renew(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
goto out;
status = nfs_ok;
out:
nfs4_unlock_state();
return status;
}

Expand Down

0 comments on commit cb86fb1

Please sign in to comment.