Skip to content

Commit

Permalink
blk-throttle: pass a gendisk to blk_throtl_init and blk_throtl_exit
Browse files Browse the repository at this point in the history
Pass the gendisk to blk_throtl_init and blk_throtl_exit 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-13-hch@lst.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>
  • Loading branch information
Christoph Hellwig authored and Jens Axboe committed Sep 27, 2022
1 parent 3657647 commit e13793b
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 9 deletions.
6 changes: 3 additions & 3 deletions block/blk-cgroup.c
Original file line number Diff line number Diff line change
Expand Up @@ -1261,7 +1261,7 @@ int blkcg_init_disk(struct gendisk *disk)
if (ret)
goto err_destroy_all;

ret = blk_throtl_init(q);
ret = blk_throtl_init(disk);
if (ret)
goto err_ioprio_exit;

Expand All @@ -1272,7 +1272,7 @@ int blkcg_init_disk(struct gendisk *disk)
return 0;

err_throtl_exit:
blk_throtl_exit(q);
blk_throtl_exit(disk);
err_ioprio_exit:
blk_ioprio_exit(disk);
err_destroy_all:
Expand All @@ -1288,7 +1288,7 @@ int blkcg_init_disk(struct gendisk *disk)
void blkcg_exit_disk(struct gendisk *disk)
{
blkg_destroy_all(disk->queue);
blk_throtl_exit(disk->queue);
blk_throtl_exit(disk);
}

static void blkcg_bind(struct cgroup_subsys_state *root_css)
Expand Down
7 changes: 5 additions & 2 deletions block/blk-throttle.c
Original file line number Diff line number Diff line change
Expand Up @@ -2351,8 +2351,9 @@ void blk_throtl_bio_endio(struct bio *bio)
}
#endif

int blk_throtl_init(struct request_queue *q)
int blk_throtl_init(struct gendisk *disk)
{
struct request_queue *q = disk->queue;
struct throtl_data *td;
int ret;

Expand Down Expand Up @@ -2394,8 +2395,10 @@ int blk_throtl_init(struct request_queue *q)
return ret;
}

void blk_throtl_exit(struct request_queue *q)
void blk_throtl_exit(struct gendisk *disk)
{
struct request_queue *q = disk->queue;

BUG_ON(!q->td);
del_timer_sync(&q->td->service_queue.pending_timer);
throtl_shutdown_wq(q);
Expand Down
8 changes: 4 additions & 4 deletions block/blk-throttle.h
Original file line number Diff line number Diff line change
Expand Up @@ -168,14 +168,14 @@ static inline struct throtl_grp *blkg_to_tg(struct blkcg_gq *blkg)
* Internal throttling interface
*/
#ifndef CONFIG_BLK_DEV_THROTTLING
static inline int blk_throtl_init(struct request_queue *q) { return 0; }
static inline void blk_throtl_exit(struct request_queue *q) { }
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 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 request_queue *q);
void blk_throtl_exit(struct request_queue *q);
int blk_throtl_init(struct gendisk *disk);
void blk_throtl_exit(struct gendisk *disk);
void blk_throtl_register_queue(struct request_queue *q);
bool __blk_throtl_bio(struct bio *bio);
void blk_throtl_cancel_bios(struct request_queue *q);
Expand Down

0 comments on commit e13793b

Please sign in to comment.