Merge branch 'stable/for-linus-5.2' of git://git.kernel.org/pub/scm/linux/kernel...

[linux-2.6-microblaze.git] / block / blk-core.c

diff --git a/block/blk-core.c b/block/blk-core.c
index a55389b..419d600 100644 (file)
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (C) 1991, 1992 Linus Torvalds
  * Copyright (C) 1994,      Karl Keyte: Added support for disk statistics
@@ -232,15 +233,6 @@ void blk_sync_queue(struct request_queue *q)
 {
        del_timer_sync(&q->timeout);
        cancel_work_sync(&q->timeout_work);
-
-       if (queue_is_mq(q)) {
-               struct blk_mq_hw_ctx *hctx;
-               int i;
-
-               cancel_delayed_work_sync(&q->requeue_work);
-               queue_for_each_hw_ctx(q, hctx, i)
-                       cancel_delayed_work_sync(&hctx->run_work);
-       }
 }
 EXPORT_SYMBOL(blk_sync_queue);
 
@@ -347,18 +339,6 @@ void blk_cleanup_queue(struct request_queue *q)
 
        blk_queue_flag_set(QUEUE_FLAG_DEAD, q);
 
-       /*
-        * make sure all in-progress dispatch are completed because
-        * blk_freeze_queue() can only complete all requests, and
-        * dispatch may still be in-progress since we dispatch requests
-        * from more than one contexts.
-        *
-        * We rely on driver to deal with the race in case that queue
-        * initialization isn't done.
-        */
-       if (queue_is_mq(q) && blk_queue_init_done(q))
-               blk_mq_quiesce_queue(q);
-
        /* for synchronous bio-based driver finish in-flight integrity i/o */
        blk_flush_integrity();
 
@@ -375,7 +355,7 @@ void blk_cleanup_queue(struct request_queue *q)
        blk_exit_queue(q);
 
        if (queue_is_mq(q))
-               blk_mq_free_queue(q);
+               blk_mq_exit_queue(q);
 
        percpu_ref_exit(&q->q_usage_counter);