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

block: move blk_rq_init to blk-mq.c 



blk_rq_init deals with a request structure, so move it to blk-mq.c

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarJohannes Thumshirn <johannes.thumshirn@wdc.com>
Link: https://lore.kernel.org/r/20211117061404.331732-7-hch@lst.de


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

block/blk-core.c

+0 −17
Original line number Diff line number Diff line
@@ -109,23 +109,6 @@ bool blk_queue_flag_test_and_set(unsigned int flag, struct request_queue *q) 
}

EXPORT_SYMBOL_GPL(blk_queue_flag_test_and_set);



void blk_rq_init(struct request_queue *q, struct request *rq)

{

	memset(rq, 0, sizeof(*rq));



	INIT_LIST_HEAD(&rq->queuelist);

	rq->q = q;

	rq->__sector = (sector_t) -1;

	INIT_HLIST_NODE(&rq->hash);

	RB_CLEAR_NODE(&rq->rb_node);

	rq->tag = BLK_MQ_NO_TAG;

	rq->internal_tag = BLK_MQ_NO_TAG;

	rq->start_time_ns = ktime_get_ns();

	rq->part = NULL;

	blk_crypto_rq_set_defaults(rq);

}

EXPORT_SYMBOL(blk_rq_init);



#define REQ_OP_NAME(name) [REQ_OP_##name] = #name

static const char *const blk_op_name[] = {

	REQ_OP_NAME(READ),

block/blk-mq.c

+17 −0
Original line number Diff line number Diff line
@@ -328,6 +328,23 @@ void blk_mq_wake_waiters(struct request_queue *q) 
			blk_mq_tag_wakeup_all(hctx->tags, true);

}



void blk_rq_init(struct request_queue *q, struct request *rq)

{

	memset(rq, 0, sizeof(*rq));



	INIT_LIST_HEAD(&rq->queuelist);

	rq->q = q;

	rq->__sector = (sector_t) -1;

	INIT_HLIST_NODE(&rq->hash);

	RB_CLEAR_NODE(&rq->rb_node);

	rq->tag = BLK_MQ_NO_TAG;

	rq->internal_tag = BLK_MQ_NO_TAG;

	rq->start_time_ns = ktime_get_ns();

	rq->part = NULL;

	blk_crypto_rq_set_defaults(rq);

}

EXPORT_SYMBOL(blk_rq_init);



static struct request *blk_mq_rq_ctx_init(struct blk_mq_alloc_data *data,

		struct blk_mq_tags *tags, unsigned int tag, u64 alloc_time_ns)

{