From 6bd144160a5554e4af052c153a094c4851a4c6aa Mon Sep 17 00:00:00 2001 From: Trond Myklebust Date: Thu, 20 Mar 2014 12:53:54 -0400 Subject: [PATCH] SUNRPC: Don't let rpc_delay() clobber non-timeout errors Signed-off-by: Trond Myklebust --- net/sunrpc/sched.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/net/sunrpc/sched.c b/net/sunrpc/sched.c index ff3cc4bf4b24..25578afe1548 100644 --- a/net/sunrpc/sched.c +++ b/net/sunrpc/sched.c @@ -637,7 +637,8 @@ static void __rpc_queue_timer_fn(unsigned long ptr) static void __rpc_atrun(struct rpc_task *task) { - task->tk_status = 0; + if (task->tk_status == -ETIMEDOUT) + task->tk_status = 0; } /* -- 2.20.1