Commit 8282d5af authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 27b31deb 6ddc9dea

net/sunrpc/svc.c

+4 −1
Original line number Diff line number Diff line
@@ -1557,9 +1557,11 @@ void svc_process(struct svc_rqst *rqstp) 
 */

void svc_process_bc(struct rpc_rqst *req, struct svc_rqst *rqstp)

{

	struct rpc_timeout timeout = {

		.to_increment		= 0,

	};

	struct rpc_task *task;

	int proc_error;

	struct rpc_timeout timeout;



	/* Build the svc_rqst used by the common processing routine */

	rqstp->rq_xid = req->rq_xid;
@@ -1612,6 +1614,7 @@ void svc_process_bc(struct rpc_rqst *req, struct svc_rqst *rqstp) 
		timeout.to_initval = req->rq_xprt->timeout->to_initval;

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

	}

	timeout.to_maxval = timeout.to_initval;

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

	task = rpc_run_bc_task(req, &timeout);