diff options
| author | Christoph Hellwig <hch@lst.de> | 2022-09-21 20:04:50 +0200 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2022-09-27 03:09:31 +0200 |
| commit | 9823538fb7efe66ce987a1e4c0e0f3dc882623c4 (patch) | |
| tree | 2e5ae0b18415151ffd4cfb442b1ac1f47463c91b /block/genhd.c | |
| parent | blk-cgroup: remove blkg_lookup_check (diff) | |
| download | linux-9823538fb7efe66ce987a1e4c0e0f3dc882623c4.tar.xz linux-9823538fb7efe66ce987a1e4c0e0f3dc882623c4.zip | |
blk-cgroup: pass a gendisk to blkcg_init_queue and blkcg_exit_queue
Pass the gendisk to blkcg_init_disk and blkcg_exit_disk as part of moving
the blk-cgroup infrastructure to be gendisk based. Also remove the
rather pointless kerneldoc comments for these internal functions with a
single caller each.
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-7-hch@lst.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block/genhd.c')
| -rw-r--r-- | block/genhd.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/block/genhd.c b/block/genhd.c index d36fabf0abc1..f1af045fac2f 100644 --- a/block/genhd.c +++ b/block/genhd.c @@ -1150,7 +1150,8 @@ static void disk_release(struct device *dev) !test_bit(GD_ADDED, &disk->state)) blk_mq_exit_queue(disk->queue); - blkcg_exit_queue(disk->queue); + blkcg_exit_disk(disk); + bioset_exit(&disk->bio_split); disk_release_events(disk); @@ -1363,7 +1364,7 @@ struct gendisk *__alloc_disk_node(struct request_queue *q, int node_id, if (xa_insert(&disk->part_tbl, 0, disk->part0, GFP_KERNEL)) goto out_destroy_part_tbl; - if (blkcg_init_queue(q)) + if (blkcg_init_disk(disk)) goto out_erase_part0; rand_initialize_disk(disk); |