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

blk-cgroup: remove blk_queue_root_blkg 



Just open code it in the only caller and drop the unused !BLK_CGROUP
stub.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarAndreas Herrmann <aherrmann@suse.de>
Acked-by: default avatarTejun Heo <tj@kernel.org>
Link: https://lore.kernel.org/r/20220921180501.1539876-3-hch@lst.de


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

block/blk-cgroup.c

+1 −2
Original line number Diff line number Diff line
@@ -915,8 +915,7 @@ static void blkcg_fill_root_iostats(void) 
	class_dev_iter_init(&iter, &block_class, NULL, &disk_type);

	while ((dev = class_dev_iter_next(&iter))) {

		struct block_device *bdev = dev_to_bdev(dev);

		struct blkcg_gq *blkg =

			blk_queue_root_blkg(bdev_get_queue(bdev));

		struct blkcg_gq *blkg = bdev->bd_disk->queue->root_blkg;

		struct blkg_iostat tmp;

		int cpu;

		unsigned long flags;

block/blk-cgroup.h

+0 −13
Original line number Diff line number Diff line
@@ -268,17 +268,6 @@ static inline struct blkcg_gq *blkg_lookup(struct blkcg *blkcg, 
	return __blkg_lookup(blkcg, q, false);

}



/**

 * blk_queue_root_blkg - return blkg for the (blkcg_root, @q) pair

 * @q: request_queue of interest

 *

 * Lookup blkg for @q at the root level. See also blkg_lookup().

 */

static inline struct blkcg_gq *blk_queue_root_blkg(struct request_queue *q)

{

	return q->root_blkg;

}



/**

 * blkg_to_pdata - get policy private data

 * @blkg: blkg of interest
@@ -507,8 +496,6 @@ struct blkcg { 
};



static inline struct blkcg_gq *blkg_lookup(struct blkcg *blkcg, void *key) { return NULL; }

static inline struct blkcg_gq *blk_queue_root_blkg(struct request_queue *q)

{ return NULL; }

static inline int blkcg_init_queue(struct request_queue *q) { return 0; }

static inline void blkcg_exit_queue(struct request_queue *q) { }

static inline int blkcg_policy_register(struct blkcg_policy *pol) { return 0; }