Skip to content

Commit ccbca11

Browse files
samasth-norwaychucklever
authored andcommitted
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: 57331a5 ("NFSv4.1: Use the nfs_client's rpc timeouts for backchannel") Signed-off-by: Samasth Norway Ananda <samasth.norway.ananda@oracle.com> Reviewed-by: Benjamin Coddington <bcodding@redhat.com> Reviewed-by: Jeff Layton <jlayton@kernel.org> Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
1 parent 41bccc9 commit ccbca11

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

net/sunrpc/svc.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1598,10 +1598,10 @@ void svc_process_bc(struct rpc_rqst *req, struct svc_rqst *rqstp)
15981598
/* Finally, send the reply synchronously */
15991599
if (rqstp->bc_to_initval > 0) {
16001600
timeout.to_initval = rqstp->bc_to_initval;
1601-
timeout.to_retries = rqstp->bc_to_initval;
1601+
timeout.to_retries = rqstp->bc_to_retries;
16021602
} else {
16031603
timeout.to_initval = req->rq_xprt->timeout->to_initval;
1604-
timeout.to_initval = req->rq_xprt->timeout->to_retries;
1604+
timeout.to_retries = req->rq_xprt->timeout->to_retries;
16051605
}
16061606
memcpy(&req->rq_snd_buf, &rqstp->rq_res, sizeof(req->rq_snd_buf));
16071607
task = rpc_run_bc_task(req, &timeout);

0 commit comments

Comments
 (0)