[DRBD-cvs] svn commit by lars - r2560 - trunk/drbd - do what we mean

[drbd-cvs at lists.linbit.com]

Author: lars
Date: 2006-10-23 18:32:56 +0200 (Mon, 23 Oct 2006)
New Revision: 2560

Modified:
   trunk/drbd/drbd_main.c
Log:
do what we mean

Modified: trunk/drbd/drbd_main.c
===================================================================
--- trunk/drbd/drbd_main.c	2006-10-23 14:27:06 UTC (rev 2559)
+++ trunk/drbd/drbd_main.c	2006-10-23 16:32:56 UTC (rev 2560)
@@ -889,8 +889,9 @@
 		drbd_bm_unlock(mdev); // }
 	}
 
-	/*  Lost contact to peer's copy of the data  */
-	if ( os.pdsk > DUnknown && ns.pdsk <= DUnknown ) {
+	/* Lost contact to peer's copy of the data */
+	if ( (os.pdsk >= Inconsistent && os.pdsk != DUnknown) &&
+	     (ns.pdsk < Inconsistent || ns.pdsk == DUnknown)) {
 		if ( mdev->p_uuid ) {
 			kfree(mdev->p_uuid);
 			mdev->p_uuid = NULL;