1 files changed, 3 insertions, 1 deletions

diff --git a/block/blk-flush.c b/block/blk-flush.c
index 058abdb50f31..ce41f666de3e 100644
--- a/block/blk-flush.c
+++ b/block/blk-flush.c
@@ -169,9 +169,11 @@ static bool blk_flush_complete_seq(struct request *rq,
         struct request_queue *q = rq->q;
         struct list_head *pending = &fq->flush_queue[fq->flush_pending_idx];
         bool queued = false, kicked;
+        unsigned int cmd_flags;
 
         BUG_ON(rq->flush.seq & seq);
         rq->flush.seq |= seq;
+        cmd_flags = rq->cmd_flags;
 
         if (likely(!error))
                 seq = blk_flush_cur_seq(rq);
@@ -212,7 +214,7 @@ static bool blk_flush_complete_seq(struct request *rq,
                 BUG();
         }
 
-        kicked = blk_kick_flush(q, fq, rq->cmd_flags);
+        kicked = blk_kick_flush(q, fq, cmd_flags);
         return kicked | queued;
 }