Commit 472e4314 authored by Ming Lei's avatar Ming Lei Committed by Jens Axboe
Browse files

block: move initialization of q->blkg_list into blkcg_init_queue 



q->blkg_list is only used by blkcg code, so move it into
blkcg_init_queue.

Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarBart Van Assche <bvanassche@acm.org>
Signed-off-by: default avatarMing Lei <ming.lei@redhat.com>
Link: https://lore.kernel.org/r/20220211101149.2368042-3-ming.lei@redhat.com


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

block/blk-cgroup.c

+2 −0
Original line number Diff line number Diff line
@@ -1175,6 +1175,8 @@ int blkcg_init_queue(struct request_queue *q) 
	bool preloaded;

	int ret;



	INIT_LIST_HEAD(&q->blkg_list);



	new_blkg = blkg_alloc(&blkcg_root, q, GFP_KERNEL);

	if (!new_blkg)

		return -ENOMEM;

block/blk-core.c

+0 −3
Original line number Diff line number Diff line
@@ -476,9 +476,6 @@ struct request_queue *blk_alloc_queue(int node_id, bool alloc_srcu) 
	timer_setup(&q->timeout, blk_rq_timed_out_timer, 0);

	INIT_WORK(&q->timeout_work, blk_timeout_work);

	INIT_LIST_HEAD(&q->icq_list);

#ifdef CONFIG_BLK_CGROUP

	INIT_LIST_HEAD(&q->blkg_list);

#endif



	kobject_init(&q->kobj, &blk_queue_ktype);