On Tue, Jan 17, 2023 at 09:12:49AM +0100, Christoph Hellwig wrote:
> Pass a gendisk to wbt_init to prepare for phasing out usage of the
> request_queue in the blk-cgroup code.
>
> Signed-off-by: Christoph Hellwig <hch@xxxxxx>
> ---
> block/blk-sysfs.c | 2 +-
> block/blk-wbt.c | 5 +++--
> block/blk-wbt.h | 4 ++--
> 3 files changed, 6 insertions(+), 5 deletions(-)
Looks good to me. Feel free to add
Reviewed-by: Andreas Herrmann <aherrmann@xxxxxxx>
> diff --git a/block/blk-sysfs.c b/block/blk-sysfs.c
> index 2074103865f45b..c2adf640e5c816 100644
> --- a/block/blk-sysfs.c
> +++ b/block/blk-sysfs.c
> @@ -500,7 +500,7 @@ static ssize_t queue_wb_lat_store(struct request_queue *q, const char *page,
>
> rqos = wbt_rq_qos(q);
> if (!rqos) {
> - ret = wbt_init(q);
> + ret = wbt_init(q->disk);
> if (ret)
> return ret;
> }
> diff --git a/block/blk-wbt.c b/block/blk-wbt.c
> index 8f9302134339c5..542271fa99e8f7 100644
> --- a/block/blk-wbt.c
> +++ b/block/blk-wbt.c
> @@ -671,7 +671,7 @@ void wbt_enable_default(struct gendisk *disk)
> return;
>
> if (queue_is_mq(q) && !disable_flag)
> - wbt_init(q);
> + wbt_init(disk);
> }
> EXPORT_SYMBOL_GPL(wbt_enable_default);
>
> @@ -835,8 +835,9 @@ static struct rq_qos_ops wbt_rqos_ops = {
> #endif
> };
>
> -int wbt_init(struct request_queue *q)
> +int wbt_init(struct gendisk *disk)
> {
> + struct request_queue *q = disk->queue;
> struct rq_wb *rwb;
> int i;
> int ret;
> diff --git a/block/blk-wbt.h b/block/blk-wbt.h
> index 7ab1cba55c25f7..b673da41a867d3 100644
> --- a/block/blk-wbt.h
> +++ b/block/blk-wbt.h
> @@ -90,7 +90,7 @@ static inline unsigned int wbt_inflight(struct rq_wb *rwb)
>
> #ifdef CONFIG_BLK_WBT
>
> -int wbt_init(struct request_queue *);
> +int wbt_init(struct gendisk *disk);
> void wbt_disable_default(struct gendisk *disk);
> void wbt_enable_default(struct gendisk *disk);
>
> @@ -104,7 +104,7 @@ u64 wbt_default_latency_nsec(struct request_queue *);
>
> #else
>
> -static inline int wbt_init(struct request_queue *q)
> +static inline int wbt_init(struct gendisk *disk)
> {
> return -EINVAL;
> }
> --
> 2.39.0
>
--
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)
