Skip to content

Commit 8282d5a

Browse files
committed
Merge tag 'nfs-for-6.10-3' of git://git.linux-nfs.org/projects/trondmy/linux-nfs
Pull NFS client fix from Trond Myklebust: - One more SUNRPC fix for the NFSv4.x backchannel timeouts * tag 'nfs-for-6.10-3' of git://git.linux-nfs.org/projects/trondmy/linux-nfs: SUNRPC: Fix backchannel reply, again
2 parents 27b31de + 6ddc9de commit 8282d5a

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

net/sunrpc/svc.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1557,9 +1557,11 @@ void svc_process(struct svc_rqst *rqstp)
15571557
*/
15581558
void svc_process_bc(struct rpc_rqst *req, struct svc_rqst *rqstp)
15591559
{
1560+
struct rpc_timeout timeout = {
1561+
.to_increment = 0,
1562+
};
15601563
struct rpc_task *task;
15611564
int proc_error;
1562-
struct rpc_timeout timeout;
15631565

15641566
/* Build the svc_rqst used by the common processing routine */
15651567
rqstp->rq_xid = req->rq_xid;
@@ -1612,6 +1614,7 @@ void svc_process_bc(struct rpc_rqst *req, struct svc_rqst *rqstp)
16121614
timeout.to_initval = req->rq_xprt->timeout->to_initval;
16131615
timeout.to_retries = req->rq_xprt->timeout->to_retries;
16141616
}
1617+
timeout.to_maxval = timeout.to_initval;
16151618
memcpy(&req->rq_snd_buf, &rqstp->rq_res, sizeof(req->rq_snd_buf));
16161619
task = rpc_run_bc_task(req, &timeout);
16171620

0 commit comments

Comments
 (0)