2 files changed, 8 insertions, 5 deletions

diff --git a/block/blk-core.c b/block/blk-core.c
index 3b080541098e..80e29c90723c 100644
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -608,8 +608,8 @@ struct request_queue *blk_alloc_queue_node(gfp_t gfp_mask, int node_id)
         /*
          * A queue starts its life with bypass turned on to avoid
          * unnecessary bypass on/off overhead and nasty surprises during
-         * init.  The initial bypass will be finished at the end of
-         * blk_init_allocated_queue().
+         * init.  The initial bypass will be finished when the queue is
+         * registered by blk_register_queue().
          */
         q->bypass_depth = 1;
         __set_bit(QUEUE_FLAG_BYPASS, &q->queue_flags);
@@ -712,9 +712,6 @@ blk_init_allocated_queue(struct request_queue *q, request_fn_proc *rfn,
         /* init elevator */
         if (elevator_init(q, NULL))
                 return NULL;
-
-        /* all done, end the initial bypass */
-        blk_queue_bypass_end(q);
         return q;
 }
 EXPORT_SYMBOL(blk_init_allocated_queue);
diff --git a/block/blk-sysfs.c b/block/blk-sysfs.c
index 247dbfd42621..ce6204608822 100644
--- a/block/blk-sysfs.c
+++ b/block/blk-sysfs.c
@@ -561,6 +561,12 @@ int blk_register_queue(struct gendisk *disk)
         if (WARN_ON(!q))
                 return -ENXIO;
 
+        /*
+         * Initialization must be complete by now.  Finish the initial
+         * bypass from queue allocation.
+         */
+        blk_queue_bypass_end(q);
+
         ret = blk_trace_init_sysfs(dev);
         if (ret)
                 return ret;