block: call blk_queue_free_zone_bitmaps from disk_release

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>
Reviewed-by: Chaitanya Kulkarni <kch@nvidia.com>
Reviewed-by: Damien Le Moal <damien.lemoal@opensource.wdc.com>
Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Link: https://lore.kernel.org/r/20220706070350.1703384-3-hch@lst.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/block/blk-sysfs.c b/block/blk-sysfs.c
index 58cb9cb..7590810 100644 (file)
--- 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 b1fb7e0..d0bdeb9 100644 (file)
--- 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;