1 files changed, 8 insertions, 5 deletions

diff --git a/block/blk-core.c b/block/blk-core.c
index 6f8dba161bfe..c359d72e9d76 100644
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -438,14 +438,17 @@ static void __blk_drain_queue(struct request_queue *q, bool drain_all)
  */
 void blk_queue_bypass_start(struct request_queue *q)
 {
-        bool drain;
-
         spin_lock_irq(q->queue_lock);
-        drain = !q->bypass_depth++;
+        q->bypass_depth++;
         queue_flag_set(QUEUE_FLAG_BYPASS, q);
         spin_unlock_irq(q->queue_lock);
 
-        if (drain) {
+        /*
+         * Queues start drained.  Skip actual draining till init is
+         * complete.  This avoids lenghty delays during queue init which
+         * can happen many times during boot.
+         */
+        if (blk_queue_init_done(q)) {
                 spin_lock_irq(q->queue_lock);
                 __blk_drain_queue(q, false);
                 spin_unlock_irq(q->queue_lock);
@@ -511,7 +514,7 @@ void blk_cleanup_queue(struct request_queue *q)
          * prevent that q->request_fn() gets invoked after draining finished.
          */
         if (q->mq_ops) {
-                blk_mq_drain_queue(q);
+                blk_mq_freeze_queue(q);
                 spin_lock_irq(lock);
         } else {
                 spin_lock_irq(lock);