diff options
| author | Christoph Hellwig <hch@lst.de> | 2023-02-14 19:33:05 +0100 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2023-02-14 22:24:09 +0100 |
| commit | b4e94f9c2c0822265a6942741d270aa16d229331 (patch) | |
| tree | e7bd8be4c47cdb4e3608e3c50542653937d0cdbf | |
| parent | Revert "blk-cgroup: move the cgroup information to struct gendisk" (diff) | |
| download | linux-b4e94f9c2c0822265a6942741d270aa16d229331.tar.xz linux-b4e94f9c2c0822265a6942741d270aa16d229331.zip | |
Revert "blk-cgroup: delay calling blkcg_exit_disk until disk_release"
This reverts commit c43332fe028c252a2a28e46be70a530f64fc3c9d as it is not
needed without moving to disk references in the blkg.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Link: https://lore.kernel.org/r/20230214183308.1658775-3-hch@lst.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>
| -rw-r--r-- | block/blk-throttle.c | 3 | ||||
| -rw-r--r-- | block/genhd.c | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/block/blk-throttle.c b/block/blk-throttle.c index 21c8d5e871ea..74bb1e753ea0 100644 --- a/block/blk-throttle.c +++ b/block/blk-throttle.c @@ -2407,8 +2407,7 @@ void blk_throtl_exit(struct gendisk *disk) { struct request_queue *q = disk->queue; - if (!q->td) - return; + BUG_ON(!q->td); del_timer_sync(&q->td->service_queue.pending_timer); throtl_shutdown_wq(q); blkcg_deactivate_policy(disk, &blkcg_policy_throtl); diff --git a/block/genhd.c b/block/genhd.c index 65373738c70b..7e031559bf51 100644 --- a/block/genhd.c +++ b/block/genhd.c @@ -668,6 +668,8 @@ void del_gendisk(struct gendisk *disk) rq_qos_exit(q); blk_mq_unquiesce_queue(q); + blkcg_exit_disk(disk); + /* * If the disk does not own the queue, allow using passthrough requests * again. Else leave the queue frozen to fail all I/O. @@ -1164,8 +1166,6 @@ static void disk_release(struct device *dev) might_sleep(); WARN_ON_ONCE(disk_live(disk)); - blkcg_exit_disk(disk); - /* * To undo the all initialization from blk_mq_init_allocated_queue in * case of a probe failure where add_disk is never called we have to |