On Wed, Sep 21, 2022 at 08:04:56PM +0200, Christoph Hellwig wrote:
> Pass the gendisk to blk_throtl_init and blk_throtl_exit as part of moving
> the blk-cgroup infrastructure to be gendisk based.
>
> Signed-off-by: Christoph Hellwig <hch@xxxxxx>
> ---
> block/blk-cgroup.c | 6 +++---
> block/blk-throttle.c | 7 +++++--
> block/blk-throttle.h | 8 ++++----
> 3 files changed, 12 insertions(+), 9 deletions(-)
Reviewed-by: Andreas Herrmann <aherrmann@xxxxxxx>
> diff --git a/block/blk-cgroup.c b/block/blk-cgroup.c
> index 82a117ff54de5..3dfd78f1312db 100644
> --- a/block/blk-cgroup.c
> +++ b/block/blk-cgroup.c
> @@ -1261,7 +1261,7 @@ int blkcg_init_disk(struct gendisk *disk)
> if (ret)
> goto err_destroy_all;
>
> - ret = blk_throtl_init(q);
> + ret = blk_throtl_init(disk);
> if (ret)
> goto err_ioprio_exit;
>
> @@ -1272,7 +1272,7 @@ int blkcg_init_disk(struct gendisk *disk)
> return 0;
>
> err_throtl_exit:
> - blk_throtl_exit(q);
> + blk_throtl_exit(disk);
> err_ioprio_exit:
> blk_ioprio_exit(disk);
> err_destroy_all:
> @@ -1288,7 +1288,7 @@ int blkcg_init_disk(struct gendisk *disk)
> void blkcg_exit_disk(struct gendisk *disk)
> {
> blkg_destroy_all(disk->queue);
> - blk_throtl_exit(disk->queue);
> + blk_throtl_exit(disk);
> }
>
> static void blkcg_bind(struct cgroup_subsys_state *root_css)
> diff --git a/block/blk-throttle.c b/block/blk-throttle.c
> index 55f2d985cfbbd..9ca8ae0ae6683 100644
> --- a/block/blk-throttle.c
> +++ b/block/blk-throttle.c
> @@ -2358,8 +2358,9 @@ void blk_throtl_bio_endio(struct bio *bio)
> }
> #endif
>
> -int blk_throtl_init(struct request_queue *q)
> +int blk_throtl_init(struct gendisk *disk)
> {
> + struct request_queue *q = disk->queue;
> struct throtl_data *td;
> int ret;
>
> @@ -2401,8 +2402,10 @@ int blk_throtl_init(struct request_queue *q)
> return ret;
> }
>
> -void blk_throtl_exit(struct request_queue *q)
> +void blk_throtl_exit(struct gendisk *disk)
> {
> + struct request_queue *q = disk->queue;
> +
> BUG_ON(!q->td);
> del_timer_sync(&q->td->service_queue.pending_timer);
> throtl_shutdown_wq(q);
> diff --git a/block/blk-throttle.h b/block/blk-throttle.h
> index 66b4292b1b92a..f75852a4e5337 100644
> --- a/block/blk-throttle.h
> +++ b/block/blk-throttle.h
> @@ -168,14 +168,14 @@ static inline struct throtl_grp *blkg_to_tg(struct blkcg_gq *blkg)
> * Internal throttling interface
> */
> #ifndef CONFIG_BLK_DEV_THROTTLING
> -static inline int blk_throtl_init(struct request_queue *q) { return 0; }
> -static inline void blk_throtl_exit(struct request_queue *q) { }
> +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 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 request_queue *q);
> -void blk_throtl_exit(struct request_queue *q);
> +int blk_throtl_init(struct gendisk *disk);
> +void blk_throtl_exit(struct gendisk *disk);
> void blk_throtl_register_queue(struct request_queue *q);
> bool __blk_throtl_bio(struct bio *bio);
> void blk_throtl_cancel_bios(struct request_queue *q);
> --
> 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)
