blk-throttle: pass a gendisk to blk_throtl_register_queue

Pass the gendisk to blk_throtl_register_queue as part of moving the
blk-cgroup infrastructure to be gendisk based.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Andreas Herrmann <aherrmann@suse.de>
Acked-by: Tejun Heo <tj@kernel.org>
Link: https://lore.kernel.org/r/20220921180501.1539876-14-hch@lst.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/block/blk-sysfs.c b/block/blk-sysfs.c
index e1f009aba6fd2ad6c3ca2a4f395658da72a1774a..e71b3b43927c0f65dcd447f8bb46eb1c4d79a2a8 100644 (file)
--- a/block/blk-sysfs.c
+++ b/block/blk-sysfs.c
@@ -844,7 +844,7 @@ int blk_register_queue(struct gendisk *disk)
 
        blk_queue_flag_set(QUEUE_FLAG_REGISTERED, q);
        wbt_enable_default(q);
-       blk_throtl_register_queue(q);
+       blk_throtl_register(disk);
 
        /* Now everything is ready and send out KOBJ_ADD uevent */
        kobject_uevent(&q->kobj, KOBJ_ADD);

diff --git a/block/blk-throttle.c b/block/blk-throttle.c
index 4879aeca75094c7535afa880891312f4556e3101..def2775fa38e068951ca6cb6358d75cab652a499 100644 (file)
--- a/block/blk-throttle.c
+++ b/block/blk-throttle.c
@@ -2408,8 +2408,9 @@ void blk_throtl_exit(struct gendisk *disk)
        kfree(q->td);
 }
 
-void blk_throtl_register_queue(struct request_queue *q)
+void blk_throtl_register(struct gendisk *disk)
 {
+       struct request_queue *q = disk->queue;
        struct throtl_data *td;
        int i;
 

diff --git a/block/blk-throttle.h b/block/blk-throttle.h
index 1c9def91088fe044f0b9f120c6d1c0889642de6a..69b7f05314e4f62330dd99ed859a567814945b79 100644 (file)
--- a/block/blk-throttle.h
+++ b/block/blk-throttle.h
@@ -170,13 +170,13 @@ static inline struct throtl_grp *blkg_to_tg(struct blkcg_gq *blkg)
 #ifndef CONFIG_BLK_DEV_THROTTLING
 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 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) { }
 #else /* CONFIG_BLK_DEV_THROTTLING */
 int blk_throtl_init(struct gendisk *disk);
 void blk_throtl_exit(struct gendisk *disk);
-void blk_throtl_register_queue(struct request_queue *q);
+void blk_throtl_register(struct gendisk *disk);
 bool __blk_throtl_bio(struct bio *bio);
 void blk_throtl_cancel_bios(struct request_queue *q);