1 files changed, 4 insertions, 1 deletions

diff --git a/block/blk-mq.c b/block/blk-mq.c
index 29275f5a996f..6e3b15f70cd7 100644
--- a/block/blk-mq.c
+++ b/block/blk-mq.c
@@ -918,7 +918,10 @@ static bool blk_mq_check_expired(struct blk_mq_hw_ctx *hctx,
          */
         if (blk_mq_req_expired(rq, next))
                 blk_mq_rq_timed_out(rq, reserved);
-        if (refcount_dec_and_test(&rq->ref))
+
+        if (is_flush_rq(rq, hctx))
+                rq->end_io(rq, 0);
+        else if (refcount_dec_and_test(&rq->ref))
                 __blk_mq_free_request(rq);
 
         return true;