[PATCH 02/17] block: call blk_queue_free_zone_bitmaps from disk_release

Christoph Hellwig
2022-07-04T12:45:20Z

The zone bitmaps are only used for non-passthrough I/O, so free them as
soon as the disk is released.

Signed-off-by: Christoph Hellwig <hch@lst.de>
---
block/blk-sysfs.c | 2 --
block/genhd.c | 1 +
2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/block/blk-sysfs.c b/block/blk-sysfs.c
index 58cb9cb9f48cd..7590810cf13fc 100644
--- a/block/blk-sysfs.c
+++ b/block/blk-sysfs.c
@@ -776,8 +776,6 @@ static void blk_release_queue(struct kobject *kobj)
blk_free_queue_stats(q->stats);
kfree(q->poll_stat);

- blk_queue_free_zone_bitmaps(q);
-
if (queue_is_mq(q))
blk_mq_release(q);

diff --git a/block/genhd.c b/block/genhd.c
index b1fb7e058b9cc..d0bdeb93e922c 100644
--- a/block/genhd.c
+++ b/block/genhd.c
@@ -1165,6 +1165,7 @@ static void disk_release(struct device *dev)

disk_release_events(disk);
kfree(disk->random);
+ blk_queue_free_zone_bitmaps(disk->queue);
xa_destroy(&disk->part_tbl);

disk->queue->disk = NULL;
--
2.30.2