diff options
| author | Trond Myklebust | 2014-03-20 17:53:54 +0100 |
|---|---|---|
| committer | Trond Myklebust | 2014-03-20 18:38:43 +0100 |
| commit | 6bd144160a5554e4af052c153a094c4851a4c6aa (patch) | |
| tree | 9a1a1c919195e717323b32785c080e363e496f74 /net/sunrpc/sched.c | |
| parent | SUNRPC: Ensure call_connect_status() deals correctly with SOFTCONN tasks (diff) | |
| download | kernel-qcow2-linux-6bd144160a5554e4af052c153a094c4851a4c6aa.tar.gz kernel-qcow2-linux-6bd144160a5554e4af052c153a094c4851a4c6aa.tar.xz kernel-qcow2-linux-6bd144160a5554e4af052c153a094c4851a4c6aa.zip | |
SUNRPC: Don't let rpc_delay() clobber non-timeout errors
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
Diffstat (limited to 'net/sunrpc/sched.c')
| -rw-r--r-- | net/sunrpc/sched.c | 3 |
1 files changed, 2 insertions, 1 deletions
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; } /* |