Commit f71475ba authored by J. Bruce Fields's avatar J. Bruce Fields Committed by Chuck Lever
Browse files

nfsd: remove unused set_client argument 



Every caller is setting this argument to false, so we don't need it.

Also cut this comment a bit and remove an unnecessary warning.

Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
parent 47fdb22d

fs/nfsd/nfs4state.c

+10 −13
Original line number Diff line number Diff line
@@ -4648,8 +4648,7 @@ static struct nfs4_client *lookup_clientid(clientid_t *clid, bool sessions, 


static __be32 set_client(clientid_t *clid,

		struct nfsd4_compound_state *cstate,

		struct nfsd_net *nn,

		bool sessions)

		struct nfsd_net *nn)

{

	if (cstate->clp) {

		if (!same_clid(&cstate->clp->cl_clientid, clid))
@@ -4659,12 +4658,10 @@ static __be32 set_client(clientid_t *clid, 
	if (STALE_CLIENTID(clid, nn))

		return nfserr_stale_clientid;

	/*

	 * For v4.1+ we get the client in the SEQUENCE op. If we don't have one

	 * cached already then we know this is for is for v4.0 and "sessions"

	 * will be false.

	 * We're in the 4.0 case (otherwise the SEQUENCE op would have

	 * set cstate->clp), so session = false:

	 */

	WARN_ON_ONCE(cstate->session);

	cstate->clp = lookup_clientid(clid, sessions, nn);

	cstate->clp = lookup_clientid(clid, false, nn);

	if (!cstate->clp)

		return nfserr_expired;

	return nfs_ok;
@@ -4688,7 +4685,7 @@ nfsd4_process_open1(struct nfsd4_compound_state *cstate, 
	if (open->op_file == NULL)

		return nfserr_jukebox;



	status = set_client(clientid, cstate, nn, false);

	status = set_client(clientid, cstate, nn);

	if (status)

		return status;

	clp = cstate->clp;
@@ -5298,7 +5295,7 @@ nfsd4_renew(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, 
	struct nfsd_net *nn = net_generic(SVC_NET(rqstp), nfsd_net_id);



	trace_nfsd_clid_renew(clid);

	status = set_client(clid, cstate, nn, false);

	status = set_client(clid, cstate, nn);

	if (status)

		return status;

	clp = cstate->clp;
@@ -5681,7 +5678,7 @@ nfsd4_lookup_stateid(struct nfsd4_compound_state *cstate, 
	if (ZERO_STATEID(stateid) || ONE_STATEID(stateid) ||

		CLOSE_STATEID(stateid))

		return nfserr_bad_stateid;

	status = set_client(&stateid->si_opaque.so_clid, cstate, nn, false);

	status = set_client(&stateid->si_opaque.so_clid, cstate, nn);

	if (status == nfserr_stale_clientid) {

		if (cstate->session)

			return nfserr_bad_stateid;
@@ -6905,7 +6902,7 @@ nfsd4_lockt(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, 
		 return nfserr_inval;



	if (!nfsd4_has_session(cstate)) {

		status = set_client(&lockt->lt_clientid, cstate, nn, false);

		status = set_client(&lockt->lt_clientid, cstate, nn);

		if (status)

			goto out;

	}
@@ -7089,7 +7086,7 @@ nfsd4_release_lockowner(struct svc_rqst *rqstp, 
	dprintk("nfsd4_release_lockowner clientid: (%08x/%08x):\n",

		clid->cl_boot, clid->cl_id);



	status = set_client(clid, cstate, nn, false);

	status = set_client(clid, cstate, nn);

	if (status)

		return status;
@@ -7236,7 +7233,7 @@ nfs4_check_open_reclaim(clientid_t *clid, 
	__be32 status;



	/* find clientid in conf_id_hashtbl */

	status = set_client(clid, cstate, nn, false);

	status = set_client(clid, cstate, nn);

	if (status)

		return nfserr_reclaim_bad;