Re: [PATCH 07/17] blk-ioprio: pass a gendisk to blk_ioprio_init and blk_ioprio_exit

From: Andreas Herrmann <aherrmann@suse.de>
To: Christoph Hellwig <hch@lst.de>
Cc: Tejun Heo <tj@kernel.org>, Jens Axboe <axboe@kernel.dk>,
	linux-block@vger.kernel.org
Subject: Re: [PATCH 07/17] blk-ioprio: pass a gendisk to blk_ioprio_init and blk_ioprio_exit
Date: Thu, 22 Sep 2022 15:38:00 +0200	[thread overview]
Message-ID: <YyxlOOWNmPmDq4D5@suselix> (raw)
In-Reply-To: <20220921180501.1539876-8-hch@lst.de>

On Wed, Sep 21, 2022 at 08:04:51PM +0200, Christoph Hellwig wrote:
> Pass the gendisk to blk_ioprio_init and blk_ioprio_exit as part of moving
> the blk-cgroup infrastructure to be gendisk based.
> 
> Signed-off-by: Christoph Hellwig <hch@lst.de>
> ---
>  block/blk-cgroup.c | 4 ++--
>  block/blk-ioprio.c | 8 ++++----
>  block/blk-ioprio.h | 8 ++++----
>  3 files changed, 10 insertions(+), 10 deletions(-)

Reviewed-by: Andreas Herrmann <aherrmann@suse.de>

> diff --git a/block/blk-cgroup.c b/block/blk-cgroup.c
> index 4ca6933a7c3f5..89974fd0db3da 100644
> --- a/block/blk-cgroup.c
> +++ b/block/blk-cgroup.c
> @@ -1257,7 +1257,7 @@ int blkcg_init_disk(struct gendisk *disk)
>  	if (preloaded)
>  		radix_tree_preload_end();
>  
> -	ret = blk_ioprio_init(q);
> +	ret = blk_ioprio_init(disk);
>  	if (ret)
>  		goto err_destroy_all;
>  
> @@ -1274,7 +1274,7 @@ int blkcg_init_disk(struct gendisk *disk)
>  err_throtl_exit:
>  	blk_throtl_exit(q);
>  err_ioprio_exit:
> -	blk_ioprio_exit(q);
> +	blk_ioprio_exit(disk);
>  err_destroy_all:
>  	blkg_destroy_all(q);
>  	return ret;
> diff --git a/block/blk-ioprio.c b/block/blk-ioprio.c
> index c00060a02c6ef..8bb6b8eba4cee 100644
> --- a/block/blk-ioprio.c
> +++ b/block/blk-ioprio.c
> @@ -202,14 +202,14 @@ void blkcg_set_ioprio(struct bio *bio)
>  		bio->bi_ioprio = prio;
>  }
>  
> -void blk_ioprio_exit(struct request_queue *q)
> +void blk_ioprio_exit(struct gendisk *disk)
>  {
> -	blkcg_deactivate_policy(q, &ioprio_policy);
> +	blkcg_deactivate_policy(disk->queue, &ioprio_policy);
>  }
>  
> -int blk_ioprio_init(struct request_queue *q)
> +int blk_ioprio_init(struct gendisk *disk)
>  {
> -	return blkcg_activate_policy(q, &ioprio_policy);
> +	return blkcg_activate_policy(disk->queue, &ioprio_policy);
>  }
>  
>  static int __init ioprio_init(void)
> diff --git a/block/blk-ioprio.h b/block/blk-ioprio.h
> index 5a1eb550e178c..b6afb8e80de05 100644
> --- a/block/blk-ioprio.h
> +++ b/block/blk-ioprio.h
> @@ -9,15 +9,15 @@ struct request_queue;
>  struct bio;
>  
>  #ifdef CONFIG_BLK_CGROUP_IOPRIO
> -int blk_ioprio_init(struct request_queue *q);
> -void blk_ioprio_exit(struct request_queue *q);
> +int blk_ioprio_init(struct gendisk *disk);
> +void blk_ioprio_exit(struct gendisk *disk);
>  void blkcg_set_ioprio(struct bio *bio);
>  #else
> -static inline int blk_ioprio_init(struct request_queue *q)
> +static inline int blk_ioprio_init(struct gendisk *disk)
>  {
>  	return 0;
>  }
> -static inline void blk_ioprio_exit(struct request_queue *q)
> +static inline void blk_ioprio_exit(struct gendisk *disk)
>  {
>  }
>  static inline void blkcg_set_ioprio(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)