Commit 5d400665 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

block: pass a gendisk to blk_queue_free_zone_bitmaps 



Switch to a gendisk based API in preparation for moving all zone related
fields from the request_queue to the gendisk.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarChaitanya Kulkarni <kch@nvidia.com>
Reviewed-by: default avatarDamien Le Moal <damien.lemoal@opensource.wdc.com>
Reviewed-by: default avatarJohannes Thumshirn <johannes.thumshirn@wdc.com>
Link: https://lore.kernel.org/r/20220706070350.1703384-9-hch@lst.de


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent b3c72f81

block/blk-zoned.c

+5 −3
Original line number Diff line number Diff line
@@ -449,8 +449,10 @@ int blkdev_zone_mgmt_ioctl(struct block_device *bdev, fmode_t mode, 
	return ret;

}



void blk_queue_free_zone_bitmaps(struct request_queue *q)

void disk_free_zone_bitmaps(struct gendisk *disk)

{

	struct request_queue *q = disk->queue;



	kfree(q->conv_zones_bitmap);

	q->conv_zones_bitmap = NULL;

	kfree(q->seq_zones_wlock);
@@ -612,7 +614,7 @@ int blk_revalidate_disk_zones(struct gendisk *disk, 
		ret = 0;

	} else {

		pr_warn("%s: failed to revalidate zones\n", disk->disk_name);

		blk_queue_free_zone_bitmaps(q);

		disk_free_zone_bitmaps(disk);

	}

	blk_mq_unfreeze_queue(q);
@@ -628,7 +630,7 @@ void disk_clear_zone_settings(struct gendisk *disk) 


	blk_mq_freeze_queue(q);



	blk_queue_free_zone_bitmaps(q);

	disk_free_zone_bitmaps(disk);

	blk_queue_flag_clear(QUEUE_FLAG_ZONE_RESETALL, q);

	q->required_elevator_features &= ~ELEVATOR_F_ZBD_SEQ_WRITE;

	q->nr_zones = 0;

block/blk.h

+2 −2
Original line number Diff line number Diff line
@@ -405,10 +405,10 @@ static inline int blk_iolatency_init(struct request_queue *q) { return 0; } 
#endif



#ifdef CONFIG_BLK_DEV_ZONED

void blk_queue_free_zone_bitmaps(struct request_queue *q);

void disk_free_zone_bitmaps(struct gendisk *disk);

void disk_clear_zone_settings(struct gendisk *disk);

#else

static inline void blk_queue_free_zone_bitmaps(struct request_queue *q) {}

static inline void disk_free_zone_bitmaps(struct gendisk *disk) {}

static inline void disk_clear_zone_settings(struct gendisk *disk) {}

#endif

block/genhd.c

+1 −1
Original line number Diff line number Diff line
@@ -1165,7 +1165,7 @@ static void disk_release(struct device *dev) 


	disk_release_events(disk);

	kfree(disk->random);

	blk_queue_free_zone_bitmaps(disk->queue);

	disk_free_zone_bitmaps(disk);

	xa_destroy(&disk->part_tbl);



	disk->queue->disk = NULL;