[PATCH] cfq-iosched: don't use a hard jiffies value, translate from msecs



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>

parent ad01b1ca

block/cfq-iosched.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;