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

nfsd: cstate->session->se_client -> cstate->clp 



I'm not sure why we're writing this out the hard way in so many places.

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

fs/nfsd/nfs4proc.c

+2 −3
Original line number Diff line number Diff line
@@ -378,8 +378,7 @@ nfsd4_open(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, 
	 * Before RECLAIM_COMPLETE done, server should deny new lock

	 */

	if (nfsd4_has_session(cstate) &&

	    !test_bit(NFSD4_CLIENT_RECLAIM_COMPLETE,

		      &cstate->session->se_client->cl_flags) &&

	    !test_bit(NFSD4_CLIENT_RECLAIM_COMPLETE, &cstate->clp->cl_flags) &&

	    open->op_claim_type != NFS4_OPEN_CLAIM_PREVIOUS)

		return nfserr_grace;
@@ -1887,7 +1886,7 @@ nfsd4_getdeviceinfo(struct svc_rqst *rqstp, 
	nfserr = nfs_ok;

	if (gdp->gd_maxcount != 0) {

		nfserr = ops->proc_getdeviceinfo(exp->ex_path.mnt->mnt_sb,

				rqstp, cstate->session->se_client, gdp);

				rqstp, cstate->clp, gdp);

	}



	gdp->gd_notify_types &= ops->notify_types;

fs/nfsd/nfs4state.c

+8 −8
Original line number Diff line number Diff line
@@ -3891,6 +3891,7 @@ nfsd4_reclaim_complete(struct svc_rqst *rqstp, 
		struct nfsd4_compound_state *cstate, union nfsd4_op_u *u)

{

	struct nfsd4_reclaim_complete *rc = &u->reclaim_complete;

	struct nfs4_client *clp = cstate->clp;

	__be32 status = 0;



	if (rc->rca_one_fs) {
@@ -3904,12 +3905,11 @@ nfsd4_reclaim_complete(struct svc_rqst *rqstp, 
	}



	status = nfserr_complete_already;

	if (test_and_set_bit(NFSD4_CLIENT_RECLAIM_COMPLETE,

			     &cstate->session->se_client->cl_flags))

	if (test_and_set_bit(NFSD4_CLIENT_RECLAIM_COMPLETE, &clp->cl_flags))

		goto out;



	status = nfserr_stale_clientid;

	if (is_client_expired(cstate->session->se_client))

	if (is_client_expired(clp))

		/*

		 * The following error isn't really legal.

		 * But we only get here if the client just explicitly
@@ -3920,8 +3920,8 @@ nfsd4_reclaim_complete(struct svc_rqst *rqstp, 
		goto out;



	status = nfs_ok;

	nfsd4_client_record_create(cstate->session->se_client);

	inc_reclaim_complete(cstate->session->se_client);

	nfsd4_client_record_create(clp);

	inc_reclaim_complete(clp);

out:

	return status;

}
@@ -5918,7 +5918,7 @@ nfsd4_test_stateid(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, 
{

	struct nfsd4_test_stateid *test_stateid = &u->test_stateid;

	struct nfsd4_test_stateid_id *stateid;

	struct nfs4_client *cl = cstate->session->se_client;

	struct nfs4_client *cl = cstate->clp;



	list_for_each_entry(stateid, &test_stateid->ts_stateid_list, ts_id_list)

		stateid->ts_id_status =
@@ -5964,7 +5964,7 @@ nfsd4_free_stateid(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, 
	stateid_t *stateid = &free_stateid->fr_stateid;

	struct nfs4_stid *s;

	struct nfs4_delegation *dp;

	struct nfs4_client *cl = cstate->session->se_client;

	struct nfs4_client *cl = cstate->clp;

	__be32 ret = nfserr_bad_stateid;



	spin_lock(&cl->cl_lock);
@@ -6693,7 +6693,7 @@ nfsd4_lock(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, 
		if (nfsd4_has_session(cstate))

			/* See rfc 5661 18.10.3: given clientid is ignored: */

			memcpy(&lock->lk_new_clientid,

				&cstate->session->se_client->cl_clientid,

				&cstate->clp->cl_clientid,

				sizeof(clientid_t));



		/* validate and update open stateid and open seqid */