mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-25 11:55:37 +00:00
blk-throttle: pass a gendisk to blk_throtl_init and blk_throtl_exit
[ Upstream commite13793bae6
] 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> Stable-dep-of:813e693023
("blk-iolatency: Fix memory leak on add_disk() failures") Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
parent
3f3307127c
commit
bde5fbafe4
3 changed files with 12 additions and 9 deletions
|
@ -1277,7 +1277,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;
|
||||
|
||||
|
@ -1288,7 +1288,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(q);
|
||||
err_destroy_all:
|
||||
|
@ -1304,7 +1304,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)
|
||||
|
|
|
@ -2276,8 +2276,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;
|
||||
|
||||
|
@ -2319,8 +2320,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);
|
||||
|
|
|
@ -159,14 +159,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);
|
||||
|
|
Loading…
Reference in a new issue