[PATCH] cfq-iosched: don't use a hard jiffies value, translate from msecs
authorJens Axboe <axboe@suse.de>
Tue, 25 Jul 2006 13:05:21 +0000 (15:05 +0200)
committerJens Axboe <axboe@suse.de>
Tue, 25 Jul 2006 13:05:21 +0000 (15:05 +0200)
The CIC_SEEKY() test really wants to use the minimum of either:

- 2 msecs (not jiffies)

- or, the pending slice time

So code it like that.

Signed-off-by: Jens Axboe <axboe@suse.de>
block/cfq-iosched.c

index 102ebc2c5c34c73f8e7f76c589559ddfde0d9885..aae3123bf3eec6501faa46fdbf3000ea4bfa97af 100644 (file)
@@ -936,7 +936,7 @@ static int cfq_arm_slice_timer(struct cfq_data *cfqd, struct cfq_queue *cfqq)
         * seeks. so allow a little bit of time for him to submit a new rq
         */
        if (sample_valid(cic->seek_samples) && CIC_SEEKY(cic))
-               sl = 2;
+               sl = min(sl, msecs_to_jiffies(2));
 
        mod_timer(&cfqd->idle_slice_timer, jiffies + sl);
        return 1;