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

blk-mq: factor out a blk_rq_init_flush helper 



Factor out a helper from blk_insert_flush that initializes the flush
machine related fields in struct request, and don't bother with the
full memset as there's just a few fields to initialize, and all but
one already have explicit initializers.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarDamien Le Moal <dlemoal@kernel.org>
Reviewed-by: default avatarBart Van Assche <bvanassche@acm.org>
Link: https://lore.kernel.org/r/20230519044050.107790-2-hch@lst.de


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

block/blk-flush.c

+10 −7
Original line number Diff line number Diff line
@@ -376,6 +376,15 @@ static enum rq_end_io_ret mq_flush_data_end_io(struct request *rq, 
	return RQ_END_IO_NONE;

}



static void blk_rq_init_flush(struct request *rq)

{

	rq->flush.seq = 0;

	INIT_LIST_HEAD(&rq->flush.list);

	rq->rq_flags |= RQF_FLUSH_SEQ;

	rq->flush.saved_end_io = rq->end_io; /* Usually NULL */

	rq->end_io = mq_flush_data_end_io;

}



/**

 * blk_insert_flush - insert a new PREFLUSH/FUA request

 * @rq: request to insert
@@ -437,13 +446,7 @@ void blk_insert_flush(struct request *rq) 
	 * @rq should go through flush machinery.  Mark it part of flush

	 * sequence and submit for further processing.

	 */

	memset(&rq->flush, 0, sizeof(rq->flush));

	INIT_LIST_HEAD(&rq->flush.list);

	rq->rq_flags |= RQF_FLUSH_SEQ;

	rq->flush.saved_end_io = rq->end_io; /* Usually NULL */



	rq->end_io = mq_flush_data_end_io;



	blk_rq_init_flush(rq);

	spin_lock_irq(&fq->mq_flush_lock);

	blk_flush_complete_seq(rq, fq, REQ_FSEQ_ACTIONS & ~policy, 0);

	spin_unlock_irq(&fq->mq_flush_lock);