Commit 5f6dc752 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

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: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarAndreas Herrmann <aherrmann@suse.de>
Acked-by: default avatarTejun Heo <tj@kernel.org>
Link: https://lore.kernel.org/r/20220921180501.1539876-14-hch@lst.de


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent e13793ba

block/blk-sysfs.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

block/blk-throttle.c

+2 −1
Original line number Diff line number Diff line
@@ -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;

block/blk-throttle.h

+2 −2
Original line number Diff line number Diff line
@@ -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);