X-Git-Url: http://ftp.safe.ca/?a=blobdiff_plain;ds=sidebyside;f=block%2Fcfq-iosched.c;h=9c4b679908f41cf034cdddc79a9bff8bcb1f4e85;hb=287d37412035d003430f69a828c98b1cc6ee6d60;hp=3010e2ec20c2d1181e1707a0d0443f897e3c4aec;hpb=963b72fc6664be12ea52f35a6addea14ec373433;p=safe%2Fjmp%2Flinux-2.6

diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c
index 3010e2e..9c4b679 100644
--- a/block/cfq-iosched.c
+++ b/block/cfq-iosched.c
@@ -1345,15 +1345,9 @@ static int cfq_dispatch_requests(struct request_queue *q, int force)
 		unsigned long last_sync = jiffies - cfqd->last_end_sync_rq;
 		unsigned int depth;
 
-		/*
-		 * must wait a bit longer
-		 */
-		if (last_sync < cfq_slice_sync) {
-			cfq_schedule_dispatch(cfqd, cfq_slice_sync - last_sync);
-			return 0;
-		}
-
-		depth = last_sync / cfq_slice_sync;
+		depth = last_sync / cfqd->cfq_slice[1];
+		if (!depth && !cfqq->dispatched)
+			depth = 1;
 		if (depth < max_dispatch)
 			max_dispatch = depth;
 	}