[DRBD-cvs] svn commit by phil - r2045 - trunk/drbd - missing commit

[drbd-cvs at lists.linbit.com]

Author: phil
Date: 2006-01-09 21:29:28 +0100 (Mon, 09 Jan 2006)
New Revision: 2045

Modified:
   trunk/drbd/drbd_receiver.c
Log:
missing commit


Modified: trunk/drbd/drbd_receiver.c
===================================================================
--- trunk/drbd/drbd_receiver.c	2006-01-07 19:27:25 UTC (rev 2044)
+++ trunk/drbd/drbd_receiver.c	2006-01-09 20:29:28 UTC (rev 2045)
@@ -1951,13 +1951,15 @@
 			// we want resync, peer has not yet decided to sync...
 			drbd_send_uuids(mdev);
 			drbd_send_state(mdev);
-		} else if ( peer_state.disk == Attaching ) {
-			// Peer should promote from Attaching to UpToDate.
-			drbd_send_state(mdev);
-			peer_state.disk = UpToDate;
 		}
 	}
 
+        if ( peer_state.disk == Attaching ) {
+		// Peer should promote from Attaching to UpToDate.
+		drbd_send_state(mdev);
+		peer_state.disk = UpToDate;
+	}
+
 	spin_lock_irq(&mdev->req_lock);
 	os = mdev->state;
 	ns.i = mdev->state.i;