[DRBD-cvs] svn commit by phil - r2345 - trunk/drbd - The fix to the issues:

[drbd-cvs at lists.linbit.com]

Author: phil
Date: 2006-08-09 16:26:13 +0200 (Wed, 09 Aug 2006)
New Revision: 2345

Modified:
   trunk/drbd/drbd_receiver.c
Log:
The fix to the issues:
http://lists.linbit.com/pipermail/drbd-dev/2006-August/000381.html

and item 3 of this mail:
http://lists.linbit.com/pipermail/drbd-dev/2006-August/000382.html



Modified: trunk/drbd/drbd_receiver.c
===================================================================
--- trunk/drbd/drbd_receiver.c	2006-08-08 15:46:14 UTC (rev 2344)
+++ trunk/drbd/drbd_receiver.c	2006-08-09 14:26:13 UTC (rev 2345)
@@ -2124,9 +2124,11 @@
 	ns.pdsk = peer_state.disk;
 	ns.peer_isp = ( peer_state.aftr_isp | peer_state.user_isp );
 	if(nconn == Connected && ns.disk == Attaching) ns.disk = UpToDate;
-	rv = _drbd_set_state(mdev,ns,ChgStateVerbose);
+	rv = _drbd_set_state(mdev,ns,ChgStateVerbose | ChgStateHard);
 	spin_unlock_irq(&mdev->req_lock);
-	after_state_ch(mdev,os,ns,ChgStateVerbose);
+	if (rv==SS_Success) {
+		after_state_ch(mdev,os,ns,ChgStateVerbose | ChgStateHard);
+	}
 
 	if(rv < SS_Success) {
 		drbd_force_state(mdev,NS(conn,StandAlone));