Commit 00ad6991 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe

blk-cgroup: pass a gendisk to blkg_destroy_all

Pass the gendisk to blkg_destroy_all 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-16-hch@lst.deSigned-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent cad9266a
...@@ -462,14 +462,9 @@ static void blkg_destroy(struct blkcg_gq *blkg) ...@@ -462,14 +462,9 @@ static void blkg_destroy(struct blkcg_gq *blkg)
percpu_ref_kill(&blkg->refcnt); percpu_ref_kill(&blkg->refcnt);
} }
/** static void blkg_destroy_all(struct gendisk *disk)
* blkg_destroy_all - destroy all blkgs associated with a request_queue
* @q: request_queue of interest
*
* Destroy all blkgs associated with @q.
*/
static void blkg_destroy_all(struct request_queue *q)
{ {
struct request_queue *q = disk->queue;
struct blkcg_gq *blkg, *n; struct blkcg_gq *blkg, *n;
int count = BLKG_DESTROY_BATCH_SIZE; int count = BLKG_DESTROY_BATCH_SIZE;
...@@ -1276,7 +1271,7 @@ int blkcg_init_disk(struct gendisk *disk) ...@@ -1276,7 +1271,7 @@ int blkcg_init_disk(struct gendisk *disk)
err_ioprio_exit: err_ioprio_exit:
blk_ioprio_exit(disk); blk_ioprio_exit(disk);
err_destroy_all: err_destroy_all:
blkg_destroy_all(q); blkg_destroy_all(disk);
return ret; return ret;
err_unlock: err_unlock:
spin_unlock_irq(&q->queue_lock); spin_unlock_irq(&q->queue_lock);
...@@ -1287,7 +1282,7 @@ int blkcg_init_disk(struct gendisk *disk) ...@@ -1287,7 +1282,7 @@ int blkcg_init_disk(struct gendisk *disk)
void blkcg_exit_disk(struct gendisk *disk) void blkcg_exit_disk(struct gendisk *disk)
{ {
blkg_destroy_all(disk->queue); blkg_destroy_all(disk);
blk_throtl_exit(disk); blk_throtl_exit(disk);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment