Commit b12e5c6c authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

blk-mq: pass a flags argument to blk_mq_add_to_requeue_list 



Replace the boolean at_head argument with the same flags that are already
passed to blk_mq_insert_request.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarDamien Le Moal <dlemoal@kernel.org>
Link: https://lore.kernel.org/r/20230413064057.707578-21-hch@lst.de


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 93fffe16

block/blk-flush.c

+2 −2
Original line number Diff line number Diff line
@@ -188,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_mq_add_to_requeue_list(rq, true);

		blk_mq_add_to_requeue_list(rq, BLK_MQ_INSERT_AT_HEAD);

		blk_mq_kick_requeue_list(q);

		break;
@@ -346,7 +346,7 @@ static void blk_kick_flush(struct request_queue *q, struct blk_flush_queue *fq, 
	smp_wmb();

	req_ref_set(flush_rq, 1);



	blk_mq_add_to_requeue_list(flush_rq, false);

	blk_mq_add_to_requeue_list(flush_rq, BLK_MQ_INSERT_AT_HEAD);

	blk_mq_kick_requeue_list(q);

}

block/blk-mq.c

+3 −3
Original line number Diff line number Diff line
@@ -1419,7 +1419,7 @@ void blk_mq_requeue_request(struct request *rq, bool kick_requeue_list) 
	/* this request will be re-inserted to io scheduler queue */

	blk_mq_sched_requeue_request(rq);



	blk_mq_add_to_requeue_list(rq, true);

	blk_mq_add_to_requeue_list(rq, BLK_MQ_INSERT_AT_HEAD);



	if (kick_requeue_list)

		blk_mq_kick_requeue_list(q);
@@ -1464,7 +1464,7 @@ static void blk_mq_requeue_work(struct work_struct *work) 
	blk_mq_run_hw_queues(q, false);

}



void blk_mq_add_to_requeue_list(struct request *rq, bool at_head)

void blk_mq_add_to_requeue_list(struct request *rq, blk_insert_t insert_flags)

{

	struct request_queue *q = rq->q;

	unsigned long flags;
@@ -1476,7 +1476,7 @@ void blk_mq_add_to_requeue_list(struct request *rq, bool at_head) 
	BUG_ON(rq->rq_flags & RQF_SOFTBARRIER);



	spin_lock_irqsave(&q->requeue_lock, flags);

	if (at_head) {

	if (insert_flags & BLK_MQ_INSERT_AT_HEAD) {

		rq->rq_flags |= RQF_SOFTBARRIER;

		list_add(&rq->queuelist, &q->requeue_list);

	} else {

block/blk-mq.h

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ int blk_mq_update_nr_requests(struct request_queue *q, unsigned int nr); 
void blk_mq_wake_waiters(struct request_queue *q);

bool blk_mq_dispatch_rq_list(struct blk_mq_hw_ctx *hctx, struct list_head *,

			     unsigned int);

void blk_mq_add_to_requeue_list(struct request *rq, bool at_head);

void blk_mq_add_to_requeue_list(struct request *rq, blk_insert_t insert_flags);

void blk_mq_flush_busy_ctxs(struct blk_mq_hw_ctx *hctx, struct list_head *list);

struct request *blk_mq_dequeue_from_ctx(struct blk_mq_hw_ctx *hctx,

					struct blk_mq_ctx *start);