[DRBD-cvs] svn commit by phil - r2903 - in trunk: . drbd - First svnp run from branches/drbd-8.0 to trunk.

[drbd-cvs at lists.linbit.com]

Author: phil
Date: 2007-05-22 15:13:37 +0200 (Tue, 22 May 2007)
New Revision: 2903

Modified:
   trunk/
   trunk/drbd/drbd_main.c
Log:
First svnp run from branches/drbd-8.0 to trunk.



Property changes on: trunk
___________________________________________________________________
Name: propagate:at:1
   - 2898
   + 2902

Modified: trunk/drbd/drbd_main.c
===================================================================
--- trunk/drbd/drbd_main.c	2007-05-22 13:12:31 UTC (rev 2902)
+++ trunk/drbd/drbd_main.c	2007-05-22 13:13:37 UTC (rev 2903)
@@ -935,15 +935,17 @@
 	}
 
 	/* Last part of the attaching process ... */
-	if ( os.disk == Attaching && ns.disk == Negotiating ) {
+	if ( ns.conn >= Connected && 
+	     os.disk == Attaching && ns.disk == Negotiating ) {
 		drbd_send_sizes(mdev);  // to start sync...
 		drbd_send_uuids(mdev);
 		drbd_send_state(mdev);
 	}
 
 	/* We want to pause/continue resync, tell peer. */
-	if (  ( os.aftr_isp != ns.aftr_isp ) ||
-	      ( os.user_isp != ns.user_isp ) ) {
+	if ( ns.conn >= Connected && 
+	     (( os.aftr_isp != ns.aftr_isp ) ||
+	      ( os.user_isp != ns.user_isp )) ) {
 		drbd_send_state(mdev);
 	}