[DRBD-cvs] svn commit by phil - r3050 - branches/drbd-8.0/drbd - Removed a workaround from the 0.7 time, that hinders us

drbd-cvs at lists.linbit.com drbd-cvs at lists.linbit.com
Tue Sep 4 15:46:42 CEST 2007


Author: phil
Date: 2007-09-04 15:46:40 +0200 (Tue, 04 Sep 2007)
New Revision: 3050

Modified:
   branches/drbd-8.0/drbd/drbd_receiver.c
Log:
Removed a workaround from the 0.7 time, that hinders us now 
while developing drbd-proxy.


Modified: branches/drbd-8.0/drbd/drbd_receiver.c
===================================================================
--- branches/drbd-8.0/drbd/drbd_receiver.c	2007-09-03 08:38:43 UTC (rev 3049)
+++ branches/drbd-8.0/drbd/drbd_receiver.c	2007-09-04 13:46:40 UTC (rev 3050)
@@ -2873,10 +2873,10 @@
 	int rv;
 
 	rv = drbd_send_handshake(mdev);
-	if (!rv) goto break_c_loop;
+	if (!rv) return 0;
 
 	rv = drbd_recv_header(mdev,&p->head);
-	if (!rv) goto break_c_loop;
+	if (!rv) return 0;
 
 	if (p->head.command != HandShake) {
 		ERR( "expected HandShake packet, received: %s (0x%04x)\n",
@@ -2923,23 +2923,6 @@
 	}
 
 	return 1;
-
- break_c_loop:
-	WARN( "My msock connect got accepted onto peer's sock!\n");
-	/* In case a tcp connection set-up takes longer than
-	   connect-int, we might get into the situation that this
-	   node's msock gets connected to the peer's sock!
-
-	   To break out of this endless loop behaviour, we need to
-	   wait unti the peer's msock connect tries are over. (1 Second)
-
-	   Additionally we wait connect-int/2 to hit with our next
-	   connect try exactly in the peer's window of expectation. */
-
-	set_current_state(TASK_INTERRUPTIBLE);
-	schedule_timeout(HZ + (mdev->net_conf->try_connect_int*HZ)/2);
-
-	return 0;
 }
 
 #if !defined(CONFIG_CRYPTO_HMAC) && !defined(CONFIG_CRYPTO_HMAC_MODULE)



More information about the drbd-cvs mailing list