summaryrefslogtreecommitdiff
path: root/drivers/block
diff options
context:
space:
mode:
authorPhilipp Reisner <philipp.reisner@linbit.com>2011-05-13 12:03:55 +0200
committerPhilipp Reisner <philipp.reisner@linbit.com>2011-05-24 10:07:22 +0200
commita8e407925d49c521151dd24b6376c1f9a04a093f (patch)
tree9751821550b2f332f9937427874854f51a454352 /drivers/block
parent76727f684aa2d6a2dc59a7e5cf77e092a1bf4fb6 (diff)
downloadkernel-common-a8e407925d49c521151dd24b6376c1f9a04a093f.tar.gz
kernel-common-a8e407925d49c521151dd24b6376c1f9a04a093f.tar.bz2
kernel-common-a8e407925d49c521151dd24b6376c1f9a04a093f.zip
drbd: Fix for the connection problems on high latency links
It seems that the real cause of all the issues where that we did not noticed in drbd_try_connect() when the other guy closes one socket if the round trip time gets higher than 100ms. There were that 100ms hard coded! Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com> Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
Diffstat (limited to 'drivers/block')
-rw-r--r--drivers/block/drbd/drbd_receiver.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c
index 0b17d426c32b..b0b0ba345e83 100644
--- a/drivers/block/drbd/drbd_receiver.c
+++ b/drivers/block/drbd/drbd_receiver.c
@@ -787,7 +787,7 @@ static int drbd_connect(struct drbd_conf *mdev)
}
if (sock && msock) {
- schedule_timeout_interruptible(HZ / 10);
+ schedule_timeout_interruptible(mdev->net_conf->ping_timeo*HZ/10);
ok = drbd_socket_okay(mdev, &sock);
ok = drbd_socket_okay(mdev, &msock) && ok;
if (ok)