Merge branches 'locking-urgent-for-linus' and 'timers-urgent-for-linus' of git:/...

[deliverable/linux.git] / block / blk-sysfs.c

diff --git a/block/blk-sysfs.c b/block/blk-sysfs.c
index 23321fbab29318ae5b550216c66eb9ae2d026c52..17f5c84ce7bfb588a5a34bc244a7ac38067b4391 100644 (file)
--- a/block/blk-sysfs.c
+++ b/block/blk-sysfs.c
@@ -554,8 +554,10 @@ int blk_register_queue(struct gendisk *disk)
         * Initialization must be complete by now.  Finish the initial
         * bypass from queue allocation.
         */
-       blk_queue_bypass_end(q);
-       queue_flag_set_unlocked(QUEUE_FLAG_INIT_DONE, q);
+       if (!blk_queue_init_done(q)) {
+               queue_flag_set_unlocked(QUEUE_FLAG_INIT_DONE, q);
+               blk_queue_bypass_end(q);
+       }
 
        ret = blk_trace_init_sysfs(dev);
        if (ret)