3 files changed, 21 insertions, 1 deletions

diff --git a/block/blk-flush.c b/block/blk-flush.c
index aedd9320e605..1eec9cbe5a0a 100644
--- a/block/blk-flush.c
+++ b/block/blk-flush.c
@@ -214,6 +214,16 @@ static void flush_end_io(struct request *flush_rq, blk_status_t error)
 
         /* release the tag's ownership to the req cloned from */
         spin_lock_irqsave(&fq->mq_flush_lock, flags);
+
+        if (!refcount_dec_and_test(&flush_rq->ref)) {
+                fq->rq_status = error;
+                spin_unlock_irqrestore(&fq->mq_flush_lock, flags);
+                return;
+        }
+
+        if (fq->rq_status != BLK_STS_OK)
+                error = fq->rq_status;
+
         hctx = flush_rq->mq_hctx;
         if (!q->elevator) {
                 blk_mq_tag_set_rq(hctx, flush_rq->tag, fq->orig_rq);
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;
diff --git a/block/blk.h b/block/blk.h
index 25773d668ec0..47fba9362e60 100644
--- a/block/blk.h
+++ b/block/blk.h
@@ -19,6 +19,7 @@ struct blk_flush_queue {
         unsigned int            flush_queue_delayed:1;
         unsigned int            flush_pending_idx:1;
         unsigned int            flush_running_idx:1;
+        blk_status_t            rq_status;
         unsigned long           flush_pending_since;
         struct list_head        flush_queue[2];
         struct list_head        flush_data_in_flight;
@@ -47,6 +48,12 @@ static inline void __blk_get_queue(struct request_queue *q)
         kobject_get(&q->kobj);
 }
 
+static inline bool
+is_flush_rq(struct request *req, struct blk_mq_hw_ctx *hctx)
+{
+        return hctx->fq->flush_rq == req;
+}
+
 struct blk_flush_queue *blk_alloc_flush_queue(struct request_queue *q,
                 int node, int cmd_size, gfp_t flags);
 void blk_free_flush_queue(struct blk_flush_queue *q);