Skip to content

Commit 9e5de62

Browse files
committed
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
2 parents a06bc2f + a7b1a48 commit 9e5de62

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

net/sunrpc/clnt.c

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2081,8 +2081,8 @@ call_transmit_status(struct rpc_task *task)
20812081
* test first.
20822082
*/
20832083
if (rpc_task_transmitted(task)) {
2084-
if (task->tk_status == 0)
2085-
xprt_request_wait_receive(task);
2084+
task->tk_status = 0;
2085+
xprt_request_wait_receive(task);
20862086
return;
20872087
}
20882088

@@ -2167,6 +2167,9 @@ call_bc_transmit_status(struct rpc_task *task)
21672167
{
21682168
struct rpc_rqst *req = task->tk_rqstp;
21692169

2170+
if (rpc_task_transmitted(task))
2171+
task->tk_status = 0;
2172+
21702173
dprint_status(task);
21712174

21722175
switch (task->tk_status) {

0 commit comments

Comments
 (0)