Merge tag 'vfio-v5.14-rc1' of git://github.com/awilliam/linux-vfio

[linux-2.6-microblaze.git] / block / blk-flush.c

diff --git a/block/blk-flush.c b/block/blk-flush.c
index 7942ca6..1002f6c 100644 (file)
--- a/block/blk-flush.c
+++ b/block/blk-flush.c
@@ -219,8 +219,6 @@ static void flush_end_io(struct request *flush_rq, blk_status_t error)
        unsigned long flags = 0;
        struct blk_flush_queue *fq = blk_get_flush_queue(q, flush_rq->mq_ctx);
 
-       blk_account_io_flush(flush_rq);
-
        /* release the tag's ownership to the req cloned from */
        spin_lock_irqsave(&fq->mq_flush_lock, flags);
 
@@ -230,6 +228,7 @@ static void flush_end_io(struct request *flush_rq, blk_status_t error)
                return;
        }
 
+       blk_account_io_flush(flush_rq);
        /*
         * Flush request has to be marked as IDLE when it is really ended
         * because its .end_io() is called from timeout code path too for