Commit ccbca118 authored by Samasth Norway Ananda's avatar Samasth Norway Ananda Committed by Chuck Lever
Browse files

NFSv4.1: Assign the right value for initval and retries for rpc timeout 



Make sure the rpc timeout was assigned with the correct value for
initial timeout and max number of retries.

Fixes: 57331a59 ("NFSv4.1: Use the nfs_client's rpc timeouts for backchannel")
Signed-off-by: default avatarSamasth Norway Ananda <samasth.norway.ananda@oracle.com>
Reviewed-by: default avatarBenjamin Coddington <bcodding@redhat.com>
Reviewed-by: default avatarJeff Layton <jlayton@kernel.org>
Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
parent 41bccc98

net/sunrpc/svc.c

+2 −2
Original line number Diff line number Diff line
@@ -1598,10 +1598,10 @@ void svc_process_bc(struct rpc_rqst *req, struct svc_rqst *rqstp) 
	/* Finally, send the reply synchronously */

	if (rqstp->bc_to_initval > 0) {

		timeout.to_initval = rqstp->bc_to_initval;

		timeout.to_retries = rqstp->bc_to_initval;

		timeout.to_retries = rqstp->bc_to_retries;

	} else {

		timeout.to_initval = req->rq_xprt->timeout->to_initval;

		timeout.to_initval = req->rq_xprt->timeout->to_retries;

		timeout.to_retries = req->rq_xprt->timeout->to_retries;

	}

	memcpy(&req->rq_snd_buf, &rqstp->rq_res, sizeof(req->rq_snd_buf));

	task = rpc_run_bc_task(req, &timeout);