projects
/
platform
/
adaptation
/
renesas_rcar
/
renesas_kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'nfs-for-2.6.33'
[platform/adaptation/renesas_rcar/renesas_kernel.git]
/
net
/
sunrpc
/
xprtsock.c
diff --git
a/net/sunrpc/xprtsock.c
b/net/sunrpc/xprtsock.c
index
04732d0
..
3d739e5
100644
(file)
--- a/
net/sunrpc/xprtsock.c
+++ b/
net/sunrpc/xprtsock.c
@@
-2019,7
+2019,7
@@
static void xs_connect(struct rpc_task *task)
if (xprt_test_and_set_connecting(xprt))
return;
- if (transport->sock != NULL) {
+ if (transport->sock != NULL
&& !RPC_IS_SOFTCONN(task)
) {
dprintk("RPC: xs_connect delayed xprt %p for %lu "
"seconds\n",
xprt, xprt->reestablish_timeout / HZ);