From 0afc11d0032e139233585a86a1773597c1187e65 Mon Sep 17 00:00:00 2001 From: Philipp Reisner Date: Wed, 1 Aug 2012 11:41:01 +0200 Subject: [PATCH] --- yaml --- r: 346229 b: refs/heads/master c: 92f14951c044198306f098e76c56a944cf88867a h: refs/heads/master i: 346227: 06b82b9ffe10265f4eb98ef1cee7103e137a0c65 v: v3 --- [refs] | 2 +- trunk/drivers/block/drbd/drbd_receiver.c | 16 ++++------------ 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/[refs] b/[refs] index 24c883fa09ca..19978177c171 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b666dbf819f9157a4afef2094ec961d216d802b5 +refs/heads/master: 92f14951c044198306f098e76c56a944cf88867a diff --git a/trunk/drivers/block/drbd/drbd_receiver.c b/trunk/drivers/block/drbd/drbd_receiver.c index 855cadfe6146..1567e9bb9bde 100644 --- a/trunk/drivers/block/drbd/drbd_receiver.c +++ b/trunk/drivers/block/drbd/drbd_receiver.c @@ -881,7 +881,7 @@ static int conn_connect(struct drbd_tconn *tconn) struct drbd_socket sock, msock; struct drbd_conf *mdev; struct net_conf *nc; - int vnr, timeout, try, h, ok; + int vnr, timeout, h, ok; bool discard_my_data; enum drbd_state_rv rv; struct accept_wait_data ad = { @@ -912,15 +912,7 @@ static int conn_connect(struct drbd_tconn *tconn) do { struct socket *s; - for (try = 0;;) { - /* 3 tries, this should take less than a second! */ - s = drbd_try_connect(tconn); - if (s || ++try >= 3) - break; - /* give the other side time to call bind() & listen() */ - schedule_timeout_interruptible(HZ / 10); - } - + s = drbd_try_connect(tconn); if (s) { if (!sock.socket) { sock.socket = s; @@ -949,10 +941,10 @@ static int conn_connect(struct drbd_tconn *tconn) retry: s = drbd_wait_for_connect(tconn, &ad); if (s) { - try = receive_first_packet(tconn, s); + int fp = receive_first_packet(tconn, s); drbd_socket_okay(&sock.socket); drbd_socket_okay(&msock.socket); - switch (try) { + switch (fp) { case P_INITIAL_DATA: if (sock.socket) { conn_warn(tconn, "initial packet S crossed\n");