Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9e5de623 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'nfs-for-5.1-5' of git://git.linux-nfs.org/projects/trondmy/linux-nfs 

Pull NFS client bugfix from Trond Myklebust:
 "Fix a regression in which an RPC call can be tagged with an error
  despite the transmission being successful"

* tag 'nfs-for-5.1-5' of git://git.linux-nfs.org/projects/trondmy/linux-nfs:
  SUNRPC: Ignore queue transmission errors on successful transmission
parents a06bc2f2 a7b1a483

net/sunrpc/clnt.c

+5 −2
Original line number Diff line number Diff line
@@ -2081,7 +2081,7 @@ call_transmit_status(struct rpc_task *task) 
	 * test first.

	 */

	if (rpc_task_transmitted(task)) {

		if (task->tk_status == 0)

		task->tk_status = 0;

		xprt_request_wait_receive(task);

		return;

	}
@@ -2167,6 +2167,9 @@ call_bc_transmit_status(struct rpc_task *task) 
{

	struct rpc_rqst *req = task->tk_rqstp;



	if (rpc_task_transmitted(task))

		task->tk_status = 0;



	dprint_status(task);



	switch (task->tk_status) {