[DRBD-cvs] svn commit by phil - r2524 - trunk/drbd - A micro fix, that makes it impossible for Network error

[drbd-cvs at lists.linbit.com]

Author: phil
Date: 2006-10-11 10:59:21 +0200 (Wed, 11 Oct 2006)
New Revision: 2524

Modified:
   trunk/drbd/drbd_main.c
Log:
A micro fix, that makes it impossible for Network errors to overwrite
a the conn state if it is already Disconnecting.


Modified: trunk/drbd/drbd_main.c
===================================================================
--- trunk/drbd/drbd_main.c	2006-10-10 12:42:11 UTC (rev 2523)
+++ trunk/drbd/drbd_main.c	2006-10-11 08:59:21 UTC (rev 2524)
@@ -649,8 +649,10 @@
 		ns.conn = os.conn;
 	}
 
-	/* Dissalow network errors (+TearDown) to overwrite each other */
-	if( os.conn >= Timeout && os.conn <= TearDown &&
+	/* Dissalow network errors (+TearDown) to overwrite each other.
+	   Dissalow network errors to overwrite the Disconnecting state. */
+	if( ( (os.conn >= Timeout && os.conn <= TearDown) 
+	      || os.conn == Disconnecting ) &&
 	    ns.conn >= Timeout && ns.conn <= TearDown ) {
 		ns.conn = os.conn;
 	}