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>
This commit is contained in:
Родитель
4ec5c0553c
Коммит
a4fa57ffb7
|
@ -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,
|
||||
|
|
Загрузка…
Ссылка в новой задаче