1 files changed, 9 insertions, 2 deletions

diff --git a/block/blk-core.c b/block/blk-core.c
index 52559715cb90..93051d151635 100644
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -1146,7 +1146,7 @@ void init_request_from_bio(struct request *req, struct bio *bio)
  */
 static inline bool queue_should_plug(struct request_queue *q)
 {
-        return !(blk_queue_nonrot(q) && blk_queue_tagged(q));
+        return !(blk_queue_nonrot(q) && blk_queue_queuing(q));
 }
 
 static int __make_request(struct request_queue *q, struct bio *bio)
@@ -1857,8 +1857,15 @@ void blk_dequeue_request(struct request *rq)
          * and to it is freed is accounted as io that is in progress at
          * the driver side.
          */
-        if (blk_account_rq(rq))
+        if (blk_account_rq(rq)) {
                 q->in_flight[rq_is_sync(rq)]++;
+                /*
+                 * Mark this device as supporting hardware queuing, if
+                 * we have more IOs in flight than 4.
+                 */
+                if (!blk_queue_queuing(q) && queue_in_flight(q) > 4)
+                        set_bit(QUEUE_FLAG_CQ, &q->queue_flags);
+        }
 }
 
 /**