diff options
| author | Christoph Hellwig <hch@lst.de> | 2023-04-13 08:40:46 +0200 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2023-04-13 14:52:29 +0200 |
| commit | a4fa57ffb7671c2df4ce597d03ef9f7d6d905a60 (patch) | |
| tree | 31472702d0d0ecc068e7e5b694096ff51c0b1ece /block/blk-flush.c | |
| parent | blk-mq: fold __blk_mq_insert_req_list into blk_mq_insert_request (diff) | |
| download | linux-a4fa57ffb7671c2df4ce597d03ef9f7d6d905a60.tar.xz linux-a4fa57ffb7671c2df4ce597d03ef9f7d6d905a60.zip | |
blk-mq: remove blk_flush_queue_rq
Just call blk_mq_add_to_requeue_list directly from the two callers.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Bart Van Assche <bvanassche@acm.org>
Reviewed-by: Damien Le Moal <dlemoal@kernel.org>
Link: https://lore.kernel.org/r/20230413064057.707578-10-hch@lst.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block/blk-flush.c')
| -rw-r--r-- | block/blk-flush.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/block/blk-flush.c b/block/blk-flush.c index 3c81b0af5b39..62ef98f604fb 100644 --- a/block/blk-flush.c +++ b/block/blk-flush.c @@ -136,11 +136,6 @@ static void blk_flush_restore_request(struct request *rq) rq->end_io = rq->flush.saved_end_io; } -static void blk_flush_queue_rq(struct request *rq, bool add_front) -{ - blk_mq_add_to_requeue_list(rq, add_front, true); -} - static void blk_account_io_flush(struct request *rq) { struct block_device *part = rq->q->disk->part0; @@ -193,7 +188,7 @@ static void blk_flush_complete_seq(struct request *rq, case REQ_FSEQ_DATA: list_move_tail(&rq->flush.list, &fq->flush_data_in_flight); - blk_flush_queue_rq(rq, true); + blk_mq_add_to_requeue_list(rq, true, true); break; case REQ_FSEQ_DONE: @@ -350,7 +345,7 @@ static void blk_kick_flush(struct request_queue *q, struct blk_flush_queue *fq, smp_wmb(); req_ref_set(flush_rq, 1); - blk_flush_queue_rq(flush_rq, false); + blk_mq_add_to_requeue_list(flush_rq, false, true); } static enum rq_end_io_ret mq_flush_data_end_io(struct request *rq, |