summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChuck Lever <cel@netapp.com>2005-06-22 17:16:28 +0000
committerTrond Myklebust <Trond.Myklebust@netapp.com>2005-06-22 16:07:32 -0400
commit20e5ac828dfd23b9080159c62a34f32d2dcd92fc (patch)
tree4edb9b0ae0e9b0a529f7f710f7a2276e44fa3425
parent0f9dc2b16884bb5957d010ed8e9114e771a05916 (diff)
downloadop-kernel-dev-20e5ac828dfd23b9080159c62a34f32d2dcd92fc.zip
op-kernel-dev-20e5ac828dfd23b9080159c62a34f32d2dcd92fc.tar.gz
[PATCH] RPC: TCP reconnects are too slow
When the network layer reports a connection close, the RPC task waiting to reconnect should be notified so it can retry immediately instead of waiting for the normal connection establishment timeout. This reverts a change made in 2.6.6 as part of adding client support for RPC over TCP socket idle timeouts. Test-plan: Destructive testing with NFS over TCP mounts. Version: Fri, 29 Apr 2005 15:31:46 -0400 Signed-off-by: Chuck Lever <cel@netapp.com> Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
-rw-r--r--net/sunrpc/xprt.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/net/sunrpc/xprt.c b/net/sunrpc/xprt.c
index a74a128..2b8789c 100644
--- a/net/sunrpc/xprt.c
+++ b/net/sunrpc/xprt.c
@@ -1101,8 +1101,7 @@ tcp_state_change(struct sock *sk)
case TCP_SYN_RECV:
break;
default:
- if (xprt_test_and_clear_connected(xprt))
- rpc_wake_up_status(&xprt->pending, -ENOTCONN);
+ xprt_disconnect(xprt);
break;
}
out:
OpenPOWER on IntegriCloud