[DRBD-cvs] r1940 - branches/drbd-0.7/drbd

[drbd-cvs at lists.linbit.com]

Author: phil
Date: 2005-09-01 09:45:50 +0200 (Thu, 01 Sep 2005)
New Revision: 1940

Modified:
   branches/drbd-0.7/drbd/drbd_actlog.c
   branches/drbd-0.7/drbd/drbd_proc.c
Log:
Argl! Lars, now you owe me a beer! 
   That change about displaying "stalled" when the syncer no 
   longer makes progess hat _two_ bugs!


Modified: branches/drbd-0.7/drbd/drbd_actlog.c
===================================================================
--- branches/drbd-0.7/drbd/drbd_actlog.c	2005-09-01 07:20:28 UTC (rev 1939)
+++ branches/drbd-0.7/drbd/drbd_actlog.c	2005-09-01 07:45:50 UTC (rev 1940)
@@ -726,8 +726,10 @@
 		// we need the lock for drbd_try_clear_on_disk_bm
 		if(jiffies - mdev->rs_mark_time > HZ*10) {
 			/* should be roling marks, but we estimate only anyways. */
-			mdev->rs_mark_time = jiffies;
-			mdev->rs_mark_left = drbd_bm_total_weight(mdev);
+			if( mdev->rs_mark_left != drbd_bm_total_weight(mdev)) {
+				mdev->rs_mark_time =jiffies;
+				mdev->rs_mark_left =drbd_bm_total_weight(mdev);
+			}
 		}
 		drbd_try_clear_on_disk_bm(mdev,sector,count);
 		/* just wake_up unconditional now,

Modified: branches/drbd-0.7/drbd/drbd_proc.c
===================================================================
--- branches/drbd-0.7/drbd/drbd_proc.c	2005-09-01 07:20:28 UTC (rev 1939)
+++ branches/drbd-0.7/drbd/drbd_proc.c	2005-09-01 07:45:50 UTC (rev 1940)
@@ -147,7 +147,7 @@
 	 */
 	dt = (jiffies - mdev->rs_mark_time) / HZ;
 
-	if (dt > HZ*20) {
+	if (dt > 20) {
 		/* if we made no update to rs_mark_time for too long,
 		 * we are stalled. show that. */
 		seq_printf(seq, "stalled\n");