[DRBD-cvs] drbd by phil; The assertion fired in one of the testru...

[drbd-user@lists.linbit.com]

DRBD CVS committal

Author  : phil
Module  : drbd

Dir     : drbd/drbd


Modified Files:
      Tag: rel-0_7-branch
	drbd_dsender.c 


Log Message:
The assertion fired in one of the testruns. For now this makes the
problem of a stucked resync go away. -- Should find the real
source of the problem and convert this to an ASSERTion again.

===================================================================
RCS file: /var/lib/cvs/drbd/drbd/drbd/Attic/drbd_dsender.c,v
retrieving revision 1.1.2.114
retrieving revision 1.1.2.115
diff -u -3 -r1.1.2.114 -r1.1.2.115
--- drbd_dsender.c	21 May 2004 11:43:05 -0000	1.1.2.114
+++ drbd_dsender.c	25 May 2004 12:20:28 -0000	1.1.2.115
@@ -644,7 +644,9 @@
 	_set_cstate(mdev,ns);
 
 	if(mdev->cstate == SyncTarget) {
-		D_ASSERT(!test_bit(STOP_SYNC_TIMER,&mdev->flags));
+		ERR_IF(test_bit(STOP_SYNC_TIMER,&mdev->flags)) {
+			clear_bit(STOP_SYNC_TIMER,&mdev->flags);
+		}
 		D_ASSERT(mdev->rs_left > 0);
 		mod_timer(&mdev->resync_timer,jiffies);
 	}