1 files changed, 11 insertions, 5 deletions

diff --git a/block/blk-flush.c b/block/blk-flush.c
index 6c9b5e189e62..bb21e4c36f70 100644
--- a/block/blk-flush.c
+++ b/block/blk-flush.c
@@ -212,13 +212,19 @@ static void flush_end_io(struct request *flush_rq, int error)
         }
 
         /*
-         * Moving a request silently to empty queue_head may stall the
-         * queue.  Kick the queue in those cases.  This function is called
-         * from request completion path and calling directly into
-         * request_fn may confuse the driver.  Always use kblockd.
+         * Kick the queue to avoid stall for two cases:
+         * 1. Moving a request silently to empty queue_head may stall the
+         * queue.
+         * 2. When flush request is running in non-queueable queue, the
+         * queue is hold. Restart the queue after flush request is finished
+         * to avoid stall.
+         * This function is called from request completion path and calling
+         * directly into request_fn may confuse the driver.  Always use
+         * kblockd.
          */
-        if (queued)
+        if (queued || q->flush_queue_delayed)
                 blk_run_queue_async(q);
+        q->flush_queue_delayed = 0;
 }
 
 /**