projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'for-v3.15-rc/omap-fixes-a' of git://git.kernel.org/pub/scm/linux/kernel...
[firefly-linux-kernel-4.4.55.git]
/
net
/
sunrpc
/
sched.c
diff --git
a/net/sunrpc/sched.c
b/net/sunrpc/sched.c
index ff3cc4bf4b24bc868088a67dd9ad92d40e42f066..25578afe15489b419409af91c97d396fdcb6404f 100644
(file)
--- 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;
}
/*