leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

blk-ioprio: pass a gendisk to blk_ioprio_init and blk_ioprio_exit

Browse Source 
Pass the gendisk to blk_ioprio_init and blk_ioprio_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-8-hch@lst.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Christoph Hellwig 2022-09-21 20:04:51 +02:00 committed by Jens Axboe
parent 9823538fb7
commit b0dde3f5d6
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
block/blk-cgroup.c
View File

@ -1257,7 +1257,7 @@ int blkcg_init_disk(struct gendisk *disk)
if (preloaded) if (preloaded)
radix_tree_preload_end(); radix_tree_preload_end();
ret = blk_ioprio_init(q); ret = blk_ioprio_init(disk);
if (ret) if (ret)
goto err_destroy_all; goto err_destroy_all;
@ -1274,7 +1274,7 @@ int blkcg_init_disk(struct gendisk *disk)
err_throtl_exit: err_throtl_exit:
blk_throtl_exit(q); blk_throtl_exit(q);
err_ioprio_exit: err_ioprio_exit:
blk_ioprio_exit(q); blk_ioprio_exit(disk);
err_destroy_all: err_destroy_all:
blkg_destroy_all(q); blkg_destroy_all(q);
return ret; return ret;

8
block/blk-ioprio.c
View File

@ -202,14 +202,14 @@ void blkcg_set_ioprio(struct bio *bio)
bio->bi_ioprio = prio; bio->bi_ioprio = prio;
} }
void blk_ioprio_exit(struct request_queue *q) void blk_ioprio_exit(struct gendisk *disk)
{ {
blkcg_deactivate_policy(q, &ioprio_policy); blkcg_deactivate_policy(disk->queue, &ioprio_policy);
} }
int blk_ioprio_init(struct request_queue *q) int blk_ioprio_init(struct gendisk *disk)
{ {
return blkcg_activate_policy(q, &ioprio_policy); return blkcg_activate_policy(disk->queue, &ioprio_policy);
} }
static int __init ioprio_init(void) static int __init ioprio_init(void)

8
block/blk-ioprio.h
View File

@ -9,15 +9,15 @@ struct request_queue;
struct bio; struct bio;
#ifdef CONFIG_BLK_CGROUP_IOPRIO #ifdef CONFIG_BLK_CGROUP_IOPRIO
int blk_ioprio_init(struct request_queue *q); int blk_ioprio_init(struct gendisk *disk);
void blk_ioprio_exit(struct request_queue *q); void blk_ioprio_exit(struct gendisk *disk);
void blkcg_set_ioprio(struct bio *bio); void blkcg_set_ioprio(struct bio *bio);
#else #else
static inline int blk_ioprio_init(struct request_queue *q) static inline int blk_ioprio_init(struct gendisk *disk)
{ {
return 0; return 0;
} }
static inline void blk_ioprio_exit(struct request_queue *q) static inline void blk_ioprio_exit(struct gendisk *disk)
{ {
} }
static inline void blkcg_set_ioprio(struct bio *bio) static inline void blkcg_set_ioprio(struct bio *bio)