kybaaz/linux-xiaomi-chiron
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

blk-throttle: pass a gendisk to blk_throtl_register_queue

Browse source 
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>
This commit is contained in:
Christoph Hellwig 2022-09-21 20:04:57 +02:00 • committed by Jens Axboe
parent e13793bae6
commit 5f6dc7522a
3 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
block/blk-sysfs.c
View file

@ -844,7 +844,7 @@ int blk_register_queue(struct gendisk *disk)
blk_queue_flag_set(QUEUE_FLAG_REGISTERED, q); blk_queue_flag_set(QUEUE_FLAG_REGISTERED, q);
wbt_enable_default(q); wbt_enable_default(q);
blk_throtl_register_queue(q); blk_throtl_register(disk);
/* Now everything is ready and send out KOBJ_ADD uevent */ /* Now everything is ready and send out KOBJ_ADD uevent */
kobject_uevent(&q->kobj, KOBJ_ADD); kobject_uevent(&q->kobj, KOBJ_ADD);

3
block/blk-throttle.c
View file

@ -2408,8 +2408,9 @@ void blk_throtl_exit(struct gendisk *disk)
kfree(q->td); 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; struct throtl_data *td;
int i; int i;

4
block/blk-throttle.h
View file

@ -170,13 +170,13 @@ static inline struct throtl_grp *blkg_to_tg(struct blkcg_gq *blkg)
#ifndef CONFIG_BLK_DEV_THROTTLING #ifndef CONFIG_BLK_DEV_THROTTLING
static inline int blk_throtl_init(struct gendisk *disk) { return 0; } 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_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 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 request_queue *q) { }
#else /* CONFIG_BLK_DEV_THROTTLING */ #else /* CONFIG_BLK_DEV_THROTTLING */
int blk_throtl_init(struct gendisk *disk); int blk_throtl_init(struct gendisk *disk);
void blk_throtl_exit(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); bool __blk_throtl_bio(struct bio *bio);
void blk_throtl_cancel_bios(struct request_queue *q); void blk_throtl_cancel_bios(struct request_queue *q);