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

Commit 408b79bc authored by J. Bruce Fields's avatar J. Bruce Fields
Browse files

nfsd4: consistent session flag setting 



We should clear these flags on any new create_session, not just on the
first one.

Signed-off-by: default avatarJ. Bruce Fields <bfields@citi.umich.edu>
parent 9045b4b9

fs/nfsd/nfs4state.c

+6 −6
Original line number Original line Diff line number Diff line
@@ -1323,12 +1323,6 @@ nfsd4_create_session(struct svc_rqst *rqstp, 
		cs_slot->sl_seqid++; /* from 0 to 1 */

		cs_slot->sl_seqid++; /* from 0 to 1 */

		move_to_confirmed(unconf);

		move_to_confirmed(unconf);





		/*

		 * We do not support RDMA or persistent sessions

		 */

		cr_ses->flags &= ~SESSION4_PERSIST;

		cr_ses->flags &= ~SESSION4_RDMA;



		if (cr_ses->flags & SESSION4_BACK_CHAN) {

		if (cr_ses->flags & SESSION4_BACK_CHAN) {

			unconf->cl_cb_xprt = rqstp->rq_xprt;

			unconf->cl_cb_xprt = rqstp->rq_xprt;

			svc_xprt_get(unconf->cl_cb_xprt);

			svc_xprt_get(unconf->cl_cb_xprt);
@@ -1348,6 +1342,12 @@ nfsd4_create_session(struct svc_rqst *rqstp, 
		goto out;

		goto out;

	}

	}





	/*

	 * We do not support RDMA or persistent sessions

	 */

	cr_ses->flags &= ~SESSION4_PERSIST;

	cr_ses->flags &= ~SESSION4_RDMA;



	status = alloc_init_session(rqstp, conf, cr_ses);

	status = alloc_init_session(rqstp, conf, cr_ses);

	if (status)

	if (status)

		goto out;

		goto out;