Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cb86fb14 authored by Trond Myklebust's avatar Trond Myklebust Committed by J. Bruce Fields
Browse files

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



Signed-off-by: default avatarTrond Myklebust <trond.myklebust@primarydata.com>
Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
parent 3974552d

fs/nfsd/nfs4state.c

+0 −6
Original line number Diff line number Diff line
@@ -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) {
@@ -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)
@@ -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);
@@ -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;

}
@@ -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);
@@ -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;

}