[PATCH]cfq-iosched: make nonrot check logic consistent
in [Kernel]
|
Prev: [PATCH-rt 1/1] softirqs: add preempt_check_resched() in ksoftirqd()
Next: sched_rt_periodic_timer vs cpu hotplug
From: Shaohua Li on 11 Nov 2009 01:20 cfq_arm_slice_timer() has logic to disable idle window for SSD device. The same thing should be done at cfq_select_queue() too, otherwise we will still see idle window. This makes the nonrot check logic consistent in cfq. Signed-off-by: Shaohua Li <shaohua.li(a)intel.com> --- block/cfq-iosched.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) Index: linux/block/cfq-iosched.c =================================================================== --- linux.orig/block/cfq-iosched.c 2009-11-11 13:44:00.000000000 +0800 +++ linux/block/cfq-iosched.c 2009-11-11 13:45:33.000000000 +0800 @@ -1215,7 +1215,8 @@ static struct cfq_queue *cfq_select_queu * conditions to happen (or time out) before selecting a new queue. */ if (timer_pending(&cfqd->idle_slice_timer) || - (cfqq->dispatched && cfq_cfqq_idle_window(cfqq))) { + (cfqq->dispatched && cfq_cfqq_idle_window(cfqq) + && !(blk_queue_nonrot(cfqd->queue) && cfqd->hw_tag))) { cfqq = NULL; goto keep_queue; } -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ |