summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTrond Myklebust <trond.myklebust@primarydata.com>2014-03-20 12:53:54 -0400
committerTrond Myklebust <trond.myklebust@primarydata.com>2014-03-20 13:38:43 -0400
commit6bd144160a5554e4af052c153a094c4851a4c6aa (patch)
tree9a1a1c919195e717323b32785c080e363e496f74
parent1fa3e2eb9db07f30a605c66d1a2fdde4b24e74d5 (diff)
downloadop-kernel-dev-6bd144160a5554e4af052c153a094c4851a4c6aa.zip
op-kernel-dev-6bd144160a5554e4af052c153a094c4851a4c6aa.tar.gz
SUNRPC: Don't let rpc_delay() clobber non-timeout errors
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
-rw-r--r--net/sunrpc/sched.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/sunrpc/sched.c b/net/sunrpc/sched.c
index ff3cc4b..25578af 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;
}
/*
OpenPOWER on IntegriCloud