1 files changed, 4 insertions, 9 deletions

diff --git a/block/blk-mq.c b/block/blk-mq.c
index e11f5f8e0313..ad69ef657e85 100644
--- a/block/blk-mq.c
+++ b/block/blk-mq.c
@@ -109,7 +109,7 @@ static void blk_mq_queue_exit(struct request_queue *q)
         __percpu_counter_add(&q->mq_usage_counter, -1, 1000000);
 }
 
-static void __blk_mq_drain_queue(struct request_queue *q)
+void blk_mq_drain_queue(struct request_queue *q)
 {
         while (true) {
                 s64 count;
@@ -120,7 +120,7 @@ static void __blk_mq_drain_queue(struct request_queue *q)
 
                 if (count == 0)
                         break;
-                blk_mq_run_queues(q, false);
+                blk_mq_start_hw_queues(q);
                 msleep(10);
         }
 }
@@ -139,12 +139,7 @@ static void blk_mq_freeze_queue(struct request_queue *q)
         spin_unlock_irq(q->queue_lock);
 
         if (drain)
-                __blk_mq_drain_queue(q);
-}
-
-void blk_mq_drain_queue(struct request_queue *q)
-{
-        __blk_mq_drain_queue(q);
+                blk_mq_drain_queue(q);
 }
 
 static void blk_mq_unfreeze_queue(struct request_queue *q)
@@ -883,7 +878,7 @@ void blk_mq_start_hw_queue(struct blk_mq_hw_ctx *hctx)
         clear_bit(BLK_MQ_S_STOPPED, &hctx->state);
 
         preempt_disable();
-        __blk_mq_run_hw_queue(hctx);
+        blk_mq_run_hw_queue(hctx, false);
         preempt_enable();
 }
 EXPORT_SYMBOL(blk_mq_start_hw_queue);