On Wed, Sep 21, 2022 at 08:04:46PM +0200, Christoph Hellwig wrote:
> Just open code it in the only caller and drop the unused !BLK_CGROUP
> stub.
>
> Signed-off-by: Christoph Hellwig <hch@xxxxxx>
> ---
> block/blk-cgroup.c | 3 +--
> block/blk-cgroup.h | 13 -------------
> 2 files changed, 1 insertion(+), 15 deletions(-)
Reviewed-by: Andreas Herrmann <aherrmann@xxxxxxx>
> diff --git a/block/blk-cgroup.c b/block/blk-cgroup.c
> index 3a88f8c011d27..4180de4cbb3e1 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 d2724d1dd7c9b..c1fb00a1dfc03 100644
> --- a/block/blk-cgroup.h
> +++ b/block/blk-cgroup.h
> @@ -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; }
> --
> 2.30.2
>
--
Regards,
Andreas
SUSE Software Solutions Germany GmbH
Frankenstrasse 146, 90461 Nürnberg, Germany
GF: Ivo Totev, Andrew Myers, Andrew McDonald, Martje Boudien Moerman
(HRB 36809, AG Nürnberg)
