block: remove blk_init_flush() and its pair

[mirror_ubuntu-bionic-kernel.git] / block / blk-mq.c

diff --git a/block/blk-mq.c b/block/blk-mq.c
index d39e8a5eaeaaab0c28e0d36daea18d0886776ace..59ca79634cb9821739777b3eeac3057f68ab2029 100644 (file)
--- a/block/blk-mq.c
+++ b/block/blk-mq.c
@@ -1861,7 +1861,8 @@ struct request_queue *blk_mq_init_queue(struct blk_mq_tag_set *set)
 
        blk_mq_add_queue_tag_set(set, q);
 
-       if (blk_init_flush(q))
+       q->fq = blk_alloc_flush_queue(q);
+       if (!q->fq)
                goto err_hw_queues;
 
        blk_mq_map_swqueue(q);