cfq-iosched: make nonrot check logic consistent

[GitHub/MotorolaMobilityLLC/kernel-slsi.git] / block / cfq-iosched.c

diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c
index 43ec3340cb582bff0f1e7dfd1d1fe906a2696544..b00ca4c86e257b7d4520086bd18c9dd530efd8b1 100644 (file)
--- a/block/cfq-iosched.c
+++ b/block/cfq-iosched.c
@@ -1796,7 +1796,8 @@ static bool cfq_should_idle(struct cfq_data *cfqd, struct cfq_queue *cfqq)
                return false;
 
        /* We do for queues that were marked with idle window flag. */
-       if (cfq_cfqq_idle_window(cfqq))
+       if (cfq_cfqq_idle_window(cfqq) &&
+          !(blk_queue_nonrot(cfqd->queue) && cfqd->hw_tag))
                return true;
 
        /*