diff options
| author | Christoph Hellwig <hch@lst.de> | 2022-09-21 20:04:46 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-01-04 11:26:22 +0100 |
| commit | 8dec3ba4d4c74afbe3d0a91f306d1c8e52a8169f (patch) | |
| tree | b4a349e0915949612d03736407498fd1515794c6 | |
| parent | 4cb8b37925a6f0e6ef95b612dbe0767221a96f90 (diff) | |
blk-cgroup: remove blk_queue_root_blkg
[ Upstream commit 928f6f00a91ecbef6cb1fe59474831ceaf205290 ]
Just open code it in the only caller and drop the unused !BLK_CGROUP
stub.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Andreas Herrmann <aherrmann@suse.de>
Acked-by: Tejun Heo <tj@kernel.org>
Link: https://lore.kernel.org/r/20220921180501.1539876-3-hch@lst.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Stable-dep-of: 813e693023ba ("blk-iolatency: Fix memory leak on add_disk() failures")
Signed-off-by: Sasha Levin <sashal@kernel.org>
| -rw-r--r-- | block/blk-cgroup.c | 3 | ||||
| -rw-r--r-- | block/blk-cgroup.h | 13 |
2 files changed, 1 insertions, 15 deletions
diff --git a/block/blk-cgroup.c b/block/blk-cgroup.c index bcd3873ac5ff..11f256214928 100644 --- a/block/blk-cgroup.c +++ b/block/blk-cgroup.c @@ -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; diff --git a/block/blk-cgroup.h b/block/blk-cgroup.h index d2724d1dd7c9..c1fb00a1dfc0 100644 --- a/block/blk-cgroup.h +++ b/block/blk-cgroup.h @@ -269,17 +269,6 @@ static inline struct blkcg_gq *blkg_lookup(struct blkcg *blkcg, } /** - * 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 * @pol: policy 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; } |