On Wed, Sep 21, 2022 at 08:04:52PM +0200, Christoph Hellwig wrote:
> Pass the gendisk to blk_iolatency_init as part of moving the blk-cgroup
> infrastructure to be gendisk based.
>
> Signed-off-by: Christoph Hellwig <hch@xxxxxx>
> ---
> block/blk-cgroup.c | 2 +-
> block/blk-iolatency.c | 3 ++-
> block/blk.h | 4 ++--
> 3 files changed, 5 insertions(+), 4 deletions(-)
Reviewed-by: Andreas Herrmann <aherrmann@xxxxxxx>
> diff --git a/block/blk-cgroup.c b/block/blk-cgroup.c
> index 89974fd0db3da..82a117ff54de5 100644
> --- a/block/blk-cgroup.c
> +++ b/block/blk-cgroup.c
> @@ -1265,7 +1265,7 @@ int blkcg_init_disk(struct gendisk *disk)
> if (ret)
> goto err_ioprio_exit;
>
> - ret = blk_iolatency_init(q);
> + ret = blk_iolatency_init(disk);
> if (ret)
> goto err_throtl_exit;
>
> diff --git a/block/blk-iolatency.c b/block/blk-iolatency.c
> index e285152345a20..c6f61fe88b875 100644
> --- a/block/blk-iolatency.c
> +++ b/block/blk-iolatency.c
> @@ -756,8 +756,9 @@ static void blkiolatency_enable_work_fn(struct work_struct *work)
> }
> }
>
> -int blk_iolatency_init(struct request_queue *q)
> +int blk_iolatency_init(struct gendisk *disk)
> {
> + struct request_queue *q = disk->queue;
> struct blk_iolatency *blkiolat;
> struct rq_qos *rqos;
> int ret;
> diff --git a/block/blk.h b/block/blk.h
> index d7142c4d2fefb..361db83147c6f 100644
> --- a/block/blk.h
> +++ b/block/blk.h
> @@ -389,9 +389,9 @@ static inline struct bio *blk_queue_bounce(struct bio *bio,
> }
>
> #ifdef CONFIG_BLK_CGROUP_IOLATENCY
> -extern int blk_iolatency_init(struct request_queue *q);
> +int blk_iolatency_init(struct gendisk *disk);
> #else
> -static inline int blk_iolatency_init(struct request_queue *q) { return 0; }
> +static int blk_iolatency_init(struct gendisk *disk) { return 0 };
> #endif
>
> #ifdef CONFIG_BLK_DEV_ZONED
> --
> 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)
