| Message ID | 20220704124500.155247-11-hch@lst.de (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [01/17] block: remove a superflous ifdef in blkdev.h | expand |
Looks good,
Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
On 7/4/22 21:44, Christoph Hellwig wrote: > 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: Damien Le Moal <damien.lemoal@opensource.wdc.com> > --- > block/blk-zoned.c | 8 +++++--- > block/blk.h | 4 ++-- > block/genhd.c | 2 +- > 3 files changed, 8 insertions(+), 6 deletions(-) > > diff --git a/block/blk-zoned.c b/block/blk-zoned.c > index 5a97b48102221..9085f9fb3ab42 100644 > --- a/block/blk-zoned.c > +++ b/block/blk-zoned.c > @@ -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; > diff --git a/block/blk.h b/block/blk.h > index 7482a3a441dd9..b71e22c97d773 100644 > --- a/block/blk.h > +++ b/block/blk.h > @@ -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 > > diff --git a/block/genhd.c b/block/genhd.c > index d0bdeb93e922c..9d30f159c59ac 100644 > --- a/block/genhd.c > +++ b/block/genhd.c > @@ -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;
On 7/4/2022 5:44 AM, Christoph Hellwig wrote: > 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> -ck
diff --git a/block/blk-zoned.c b/block/blk-zoned.c index 5a97b48102221..9085f9fb3ab42 100644 --- a/block/blk-zoned.c +++ b/block/blk-zoned.c @@ -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; diff --git a/block/blk.h b/block/blk.h index 7482a3a441dd9..b71e22c97d773 100644 --- a/block/blk.h +++ b/block/blk.h @@ -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 diff --git a/block/genhd.c b/block/genhd.c index d0bdeb93e922c..9d30f159c59ac 100644 --- a/block/genhd.c +++ b/block/genhd.c @@ -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;
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> --- block/blk-zoned.c | 8 +++++--- block/blk.h | 4 ++-- block/genhd.c | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-)