1 files changed, 11 insertions, 0 deletions

diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c
index 986865e3fbc5..ca4d19907243 100644
--- a/block/cfq-iosched.c
+++ b/block/cfq-iosched.c
@@ -2285,6 +2285,17 @@ static struct cfq_queue *cfq_select_queue(struct cfq_data *cfqd)
                 goto keep_queue;
         }
 
+        /*
+         * This is a deep seek queue, but the device is much faster than
+         * the queue can deliver, don't idle
+         **/
+        if (CFQQ_SEEKY(cfqq) && cfq_cfqq_idle_window(cfqq) &&
+            (cfq_cfqq_slice_new(cfqq) ||
+            (cfqq->slice_end - jiffies > jiffies - cfqq->slice_start))) {
+                cfq_clear_cfqq_deep(cfqq);
+                cfq_clear_cfqq_idle_window(cfqq);
+        }
+
         if (cfqq->dispatched && cfq_should_idle(cfqd, cfqq)) {
                 cfqq = NULL;
                 goto keep_queue;