UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: 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-9-hch@lst.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Christoph Hellwig 2022-07-06 09:03:42 +02:00 committed by Jens Axboe
parent b3c72f8138
commit 5d40066567
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
block/blk-zoned.c
View File

@ -449,8 +449,10 @@ fail:
return ret; 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); kfree(q->conv_zones_bitmap);
q->conv_zones_bitmap = NULL; q->conv_zones_bitmap = NULL;
kfree(q->seq_zones_wlock); kfree(q->seq_zones_wlock);
@ -612,7 +614,7 @@ int blk_revalidate_disk_zones(struct gendisk *disk,
ret = 0; ret = 0;
} else { } else {
pr_warn("%s: failed to revalidate zones\n", disk->disk_name); 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); blk_mq_unfreeze_queue(q);
@ -628,7 +630,7 @@ void disk_clear_zone_settings(struct gendisk *disk)
blk_mq_freeze_queue(q); 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); blk_queue_flag_clear(QUEUE_FLAG_ZONE_RESETALL, q);
q->required_elevator_features &= ~ELEVATOR_F_ZBD_SEQ_WRITE; q->required_elevator_features &= ~ELEVATOR_F_ZBD_SEQ_WRITE;
q->nr_zones = 0; q->nr_zones = 0;

4
block/blk.h
View File

@ -405,10 +405,10 @@ static inline int blk_iolatency_init(struct request_queue *q) { return 0; }
#endif #endif
#ifdef CONFIG_BLK_DEV_ZONED #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); void disk_clear_zone_settings(struct gendisk *disk);
#else #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) {} static inline void disk_clear_zone_settings(struct gendisk *disk) {}
#endif #endif

2
block/genhd.c
View File

@ -1165,7 +1165,7 @@ static void disk_release(struct device *dev)
disk_release_events(disk); disk_release_events(disk);
kfree(disk->random); kfree(disk->random);
blk_queue_free_zone_bitmaps(disk->queue); disk_free_zone_bitmaps(disk);
xa_destroy(&disk->part_tbl); xa_destroy(&disk->part_tbl);
disk->queue->disk = NULL; disk->queue->disk = NULL;