nfsd-6.8 fixes:
- Fix a recent backchannel timeout fix -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEKLLlsBKG3yQ88j7+M2qzM29mf5cFAmW7ptkACgkQM2qzM29m f5cRUg//Zv6OAi99qIyCwKMk0CbebGy3BSvZvzRlIdlRaG2sYlwGZyHJ+OjmEHJ3 zZNXMtCW5XbzQCcxriZwFy4sySA1KGF5onVwcn7J5nSLyLynVHww6uXfpAWyqgMx H/0QGDJ+rOLicuTCBk5nKygLbTymrbmWDMZ4moeII/59wImowSxbR/4HH5xR3wSt wFU0E7ZQ76DRvGNq3cU4B3M8RVC2Z7zHEMymSHQl373TdBBCmkppcDAgqCDZKY9B 1bRAZMNBNI54ljMdHioJ0yO5pnshQwWB3Y5EARFWMXoe3N7xpdv+sb/kIzt1xLa+ COu/SCYfhHJMW6nA10l0QQh7QneH5vR9Ar1h+fIBc5ZCyZ7NY1Q89bUDVsx2ZuQ0 XLpnNq+zim7piIqhBSkocdoaRxn/i8LU24v4qvIcybtR/gnn3we/1fm3Intd8omH Q57X5+Cz3rLRoSnwZCDt1b/qJwIRgWVF/aHSUEqSUCCantADnRA3hSh3rS1JzzA6 yjONs5xP5CohiTZobG4lWGP48WOYkzaaKv+ASZFpkBqfOA0/lnt2aBKZ9aQdhMyL ZWWcaMrkwshkWZSl0gOIhNB5Cy3NOF5WZogORAlqw2xcsyV5KQ7dzJdJ+vv3cp+z iZg14sBrEv6h6RO3Qmf7R5f11/nQLfogFJlC/5lyeGL1sDcpBUc= =m/U7 -----END PGP SIGNATURE----- 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
This commit is contained in:
commit
cfdf0c09a6
|
@ -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);
|
||||
|
|
Loading…
Reference in New Issue