On Wed, Sep 21, 2022 at 08:04:58PM +0200, Christoph Hellwig wrote:
> Pass the gendisk to blk_throtl_cancel_bios as part of moving the
> blk-cgroup infrastructure to be gendisk based.
>
> Signed-off-by: Christoph Hellwig <hch@xxxxxx>
> ---
> block/blk-throttle.c | 3 ++-
> block/blk-throttle.h | 4 ++--
> block/genhd.c | 2 +-
> 3 files changed, 5 insertions(+), 4 deletions(-)
Reviewed-by: Andreas Herrmann <aherrmann@xxxxxxx>
> diff --git a/block/blk-throttle.c b/block/blk-throttle.c
> index a9709d4af6f39..8c683d5050483 100644
> --- a/block/blk-throttle.c
> +++ b/block/blk-throttle.c
> @@ -1723,8 +1723,9 @@ struct blkcg_policy blkcg_policy_throtl = {
> .pd_free_fn = throtl_pd_free,
> };
>
> -void blk_throtl_cancel_bios(struct request_queue *q)
> +void blk_throtl_cancel_bios(struct gendisk *disk)
> {
> + struct request_queue *q = disk->queue;
> struct cgroup_subsys_state *pos_css;
> struct blkcg_gq *blkg;
>
> diff --git a/block/blk-throttle.h b/block/blk-throttle.h
> index 7e217e613aee2..143991fd13228 100644
> --- a/block/blk-throttle.h
> +++ b/block/blk-throttle.h
> @@ -172,13 +172,13 @@ 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(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) { }
> +static inline void blk_throtl_cancel_bios(struct gendisk *disk) { }
> #else /* CONFIG_BLK_DEV_THROTTLING */
> int blk_throtl_init(struct gendisk *disk);
> void blk_throtl_exit(struct gendisk *disk);
> void blk_throtl_register(struct gendisk *disk);
> bool __blk_throtl_bio(struct bio *bio);
> -void blk_throtl_cancel_bios(struct request_queue *q);
> +void blk_throtl_cancel_bios(struct gendisk *disk);
> static inline bool blk_throtl_bio(struct bio *bio)
> {
> struct throtl_grp *tg = blkg_to_tg(bio->bi_blkg);
> diff --git a/block/genhd.c b/block/genhd.c
> index f1af045fac2fe..d6a21803a57e2 100644
> --- a/block/genhd.c
> +++ b/block/genhd.c
> @@ -626,7 +626,7 @@ void del_gendisk(struct gendisk *disk)
> pm_runtime_set_memalloc_noio(disk_to_dev(disk), false);
> device_del(disk_to_dev(disk));
>
> - blk_throtl_cancel_bios(disk->queue);
> + blk_throtl_cancel_bios(disk);
>
> blk_sync_queue(q);
> blk_flush_integrity();
> --
> 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)
