[DRBD-cvs] r1541 - trunk/drbd

[svn at svn.drbd.org]

Author: phil
Date: 2004-09-20 22:20:44 +0200 (Mon, 20 Sep 2004)
New Revision: 1541

Modified:
   trunk/drbd/drbd_worker.c
Log:
* Removes the hardcoded 30MB/sec resync speed limit.
* Makes resync speed correction more smoth.
(Should replace SLEEP_TIME with the actual sleep time?)


Modified: trunk/drbd/drbd_worker.c
===================================================================
--- trunk/drbd/drbd_worker.c	2004-09-20 20:14:10 UTC (rev 1540)
+++ trunk/drbd/drbd_worker.c	2004-09-20 20:20:44 UTC (rev 1541)
@@ -464,11 +464,10 @@
 
         number = SLEEP_TIME*mdev->sync_conf.rate / ((BM_BLOCK_SIZE/1024)*HZ);
 
-        if(number > 1000) number=1000;  // Remove later
-	if (atomic_read(&mdev->rs_pending_cnt)>1200) {
-		// INFO("pending cnt high -- throttling resync.\n");
+	if (atomic_read(&mdev->rs_pending_cnt)>number) {
 		goto requeue;
 	}
+	number -= atomic_read(&mdev->rs_pending_cnt);
 
 	for(i=0;i<number;i++) {