Skip to content

Commit a4fa57f

Browse files
Christoph Hellwigaxboe
authored andcommitted
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>
1 parent 4ec5c05 commit a4fa57f

1 file changed

Lines changed: 2 additions & 7 deletions

File tree

block/blk-flush.c

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -136,11 +136,6 @@ static void blk_flush_restore_request(struct request *rq)
136136
rq->end_io = rq->flush.saved_end_io;
137137
}
138138

139-
static void blk_flush_queue_rq(struct request *rq, bool add_front)
140-
{
141-
blk_mq_add_to_requeue_list(rq, add_front, true);
142-
}
143-
144139
static void blk_account_io_flush(struct request *rq)
145140
{
146141
struct block_device *part = rq->q->disk->part0;
@@ -193,7 +188,7 @@ static void blk_flush_complete_seq(struct request *rq,
193188

194189
case REQ_FSEQ_DATA:
195190
list_move_tail(&rq->flush.list, &fq->flush_data_in_flight);
196-
blk_flush_queue_rq(rq, true);
191+
blk_mq_add_to_requeue_list(rq, true, true);
197192
break;
198193

199194
case REQ_FSEQ_DONE:
@@ -350,7 +345,7 @@ static void blk_kick_flush(struct request_queue *q, struct blk_flush_queue *fq,
350345
smp_wmb();
351346
req_ref_set(flush_rq, 1);
352347

353-
blk_flush_queue_rq(flush_rq, false);
348+
blk_mq_add_to_requeue_list(flush_rq, false, true);
354349
}
355350

356351
static enum rq_end_io_ret mq_flush_data_end_io(struct request *rq,

0 commit comments

Comments
 (0)