diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2009-12-13 13:56:27 -0500 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2009-12-13 13:56:27 -0500 |
| commit | 52c9948b1fd80381ba5a9a87dcc4fbe3cf4979b8 (patch) | |
| tree | 7bca6a20560f428442f18450df0948774f982df0 /net/sunrpc/xprtsock.c | |
| parent | f40542532e96dda5506eb76badea322f2ae4731c (diff) | |
| parent | 190f38e5cedc910940b1da9015f00458c18f97b4 (diff) | |
Merge branch 'nfs-for-2.6.33'
Diffstat (limited to 'net/sunrpc/xprtsock.c')
| -rw-r--r-- | net/sunrpc/xprtsock.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c index 04732d09013e..3d739e5d15d8 100644 --- a/net/sunrpc/xprtsock.c +++ b/net/sunrpc/xprtsock.c | |||
| @@ -2019,7 +2019,7 @@ static void xs_connect(struct rpc_task *task) | |||
| 2019 | if (xprt_test_and_set_connecting(xprt)) | 2019 | if (xprt_test_and_set_connecting(xprt)) |
| 2020 | return; | 2020 | return; |
| 2021 | 2021 | ||
| 2022 | if (transport->sock != NULL) { | 2022 | if (transport->sock != NULL && !RPC_IS_SOFTCONN(task)) { |
| 2023 | dprintk("RPC: xs_connect delayed xprt %p for %lu " | 2023 | dprintk("RPC: xs_connect delayed xprt %p for %lu " |
| 2024 | "seconds\n", | 2024 | "seconds\n", |
| 2025 | xprt, xprt->reestablish_timeout / HZ); | 2025 | xprt, xprt->reestablish_timeout / HZ); |