Skip to content

Commit cfdf0c0

Browse files
committed
Merge tag 'nfsd-6.8-2' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux
Pull nfsd fix from Chuck Lever: - Fix a recent backchannel timeout fix * tag 'nfsd-6.8-2' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux: NFSv4.1: Assign the right value for initval and retries for rpc timeout
2 parents 49a4be2 + ccbca11 commit cfdf0c0

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

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)