On Wed, Sep 21, 2022 at 08:04:57PM +0200, Christoph Hellwig wrote:
> Pass the gendisk to blk_throtl_register_queue as part of moving the
> blk-cgroup infrastructure to be gendisk based.
>
> Signed-off-by: Christoph Hellwig <hch@xxxxxx>
> ---
> block/blk-sysfs.c | 2 +-
> block/blk-throttle.c | 3 ++-
> block/blk-throttle.h | 4 ++--
> 3 files changed, 5 insertions(+), 4 deletions(-)
Reviewed-by: Andreas Herrmann <aherrmann@xxxxxxx>
> diff --git a/block/blk-sysfs.c b/block/blk-sysfs.c
> index e1f009aba6fd2..e71b3b43927c0 100644
> --- a/block/blk-sysfs.c
> +++ b/block/blk-sysfs.c
> @@ -844,7 +844,7 @@ int blk_register_queue(struct gendisk *disk)
>
> blk_queue_flag_set(QUEUE_FLAG_REGISTERED, q);
> wbt_enable_default(q);
> - blk_throtl_register_queue(q);
> + blk_throtl_register(disk);
>
> /* Now everything is ready and send out KOBJ_ADD uevent */
> kobject_uevent(&q->kobj, KOBJ_ADD);
> diff --git a/block/blk-throttle.c b/block/blk-throttle.c
> index 9ca8ae0ae6683..a9709d4af6f39 100644
> --- a/block/blk-throttle.c
> +++ b/block/blk-throttle.c
> @@ -2415,8 +2415,9 @@ void blk_throtl_exit(struct gendisk *disk)
> kfree(q->td);
> }
>
> -void blk_throtl_register_queue(struct request_queue *q)
> +void blk_throtl_register(struct gendisk *disk)
> {
> + struct request_queue *q = disk->queue;
> struct throtl_data *td;
> int i;
>
> diff --git a/block/blk-throttle.h b/block/blk-throttle.h
> index f75852a4e5337..7e217e613aee2 100644
> --- a/block/blk-throttle.h
> +++ b/block/blk-throttle.h
> @@ -170,13 +170,13 @@ static inline struct throtl_grp *blkg_to_tg(struct blkcg_gq *blkg)
> #ifndef CONFIG_BLK_DEV_THROTTLING
> static inline int blk_throtl_init(struct gendisk *disk) { return 0; }
> static inline void blk_throtl_exit(struct gendisk *disk) { }
> -static inline void blk_throtl_register_queue(struct request_queue *q) { }
> +static inline void blk_throtl_register(struct gendisk *disk) { }
> static inline bool blk_throtl_bio(struct bio *bio) { return false; }
> static inline void blk_throtl_cancel_bios(struct request_queue *q) { }
> #else /* CONFIG_BLK_DEV_THROTTLING */
> int blk_throtl_init(struct gendisk *disk);
> void blk_throtl_exit(struct gendisk *disk);
> -void blk_throtl_register_queue(struct request_queue *q);
> +void blk_throtl_register(struct gendisk *disk);
> bool __blk_throtl_bio(struct bio *bio);
> void blk_throtl_cancel_bios(struct request_queue *q);
> static inline bool blk_throtl_bio(struct bio *bio)
> --
> 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)
