1 files changed, 5 insertions, 3 deletions

diff --git a/block/blk-flush.c b/block/blk-flush.c
index 9288aaf35c21..9143e85226c7 100644
--- a/block/blk-flush.c
+++ b/block/blk-flush.c
@@ -284,9 +284,8 @@ static void mq_flush_work(struct work_struct *work)
 
         q = container_of(work, struct request_queue, mq_flush_work);
 
-        /* We don't need set REQ_FLUSH_SEQ, it's for consistency */
         rq = blk_mq_alloc_request(q, WRITE_FLUSH|REQ_FLUSH_SEQ,
-                __GFP_WAIT|GFP_ATOMIC, true);
+                __GFP_WAIT|GFP_ATOMIC, false);
         rq->cmd_type = REQ_TYPE_FS;
         rq->end_io = flush_end_io;
 
@@ -408,8 +407,11 @@ void blk_insert_flush(struct request *rq)
         /*
          * @policy now records what operations need to be done.  Adjust
          * REQ_FLUSH and FUA for the driver.
+         * We keep REQ_FLUSH for mq to track flush requests. For !FUA,
+         * we never dispatch the request directly.
          */
-        rq->cmd_flags &= ~REQ_FLUSH;
+        if (rq->cmd_flags & REQ_FUA)
+                rq->cmd_flags &= ~REQ_FLUSH;
         if (!(fflags & REQ_FUA))
                 rq->cmd_flags &= ~REQ_FUA;