[DRBD-cvs] svn commit by phil - r2797 - trunk/drbd - Ernest: Fix for the overall resync-rate reporting.

[drbd-cvs at lists.linbit.com]

Author: phil
Date: 2007-03-20 12:46:23 +0100 (Tue, 20 Mar 2007)
New Revision: 2797

Modified:
   trunk/drbd/drbd_actlog.c
Log:
Ernest: Fix for the overall resync-rate reporting.


Modified: trunk/drbd/drbd_actlog.c
===================================================================
--- trunk/drbd/drbd_actlog.c	2007-03-14 14:59:55 UTC (rev 2796)
+++ trunk/drbd/drbd_actlog.c	2007-03-20 11:46:23 UTC (rev 2797)
@@ -961,7 +961,9 @@
 		// 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. */
-			if( mdev->rs_mark_left != drbd_bm_total_weight(mdev)) {
+			if( mdev->rs_mark_left != drbd_bm_total_weight(mdev) &&
+			    mdev->state.conn != PausedSyncT &&
+			    mdev->state.conn != PausedSyncS ) {
 				mdev->rs_mark_time =jiffies;
 				mdev->rs_mark_left =drbd_bm_total_weight(mdev);
 			}