block: Remove unused flush_queue_delayed in struct blk_flush_queue
authorBaolin Wang <baolin.wang7@gmail.com>
Sun, 17 May 2020 11:49:41 +0000 (19:49 +0800)
committerJens Axboe <axboe@kernel.dk>
Tue, 19 May 2020 15:42:46 +0000 (09:42 -0600)
The flush_queue_delayed was introdued to hold queue if flush is
running for non-queueable flush drive by commit 3ac0cc450870
("hold queue if flush is running for non-queueable flush drive"),
but the non mq parts of the flush code had been removed by
commit 7e992f847a08 ("block: remove non mq parts from the flush code"),
as well as removing the usage of the flush_queue_delayed flag.
Thus remove the unused flush_queue_delayed flag.

Signed-off-by: Baolin Wang <baolin.wang7@gmail.com>
Reviewed-by: Ming Lei <ming.lei@redhat.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
block/blk-flush.c
block/blk.h

index c7f396e..b733f7a 100644 (file)
@@ -258,7 +258,6 @@ static void flush_end_io(struct request *flush_rq, blk_status_t error)
                blk_flush_complete_seq(rq, fq, seq, error);
        }
 
-       fq->flush_queue_delayed = 0;
        spin_unlock_irqrestore(&fq->mq_flush_lock, flags);
 }
 
index af11fd4..5db4ec1 100644 (file)
@@ -19,7 +19,6 @@ extern struct dentry *blk_debugfs_root;
 #endif
 
 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;