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

blk-throttle: pass a gendisk to blk_throtl_cancel_bios 



Pass the gendisk to blk_throtl_cancel_bios 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-15-hch@lst.de


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

block/blk-throttle.c

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

block/blk-throttle.h

+2 −2
Original line number Diff line number Diff line
@@ -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_should_throtl(struct bio *bio)

{

block/genhd.c

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