On 7/4/22 21:44, Christoph Hellwig wrote:
> Always use bdev_zone_sectors instead.
>
> Signed-off-by: Christoph Hellwig <hch@xxxxxx>
Reviewed-by: Damien Le Moal <damien.lemoal@xxxxxxxxxxxxxxxxxx>
> ---
> drivers/md/dm-table.c | 4 +---
> drivers/md/dm-zone.c | 10 ++++++----
> include/linux/blkdev.h | 11 +++--------
> 3 files changed, 10 insertions(+), 15 deletions(-)
>
> diff --git a/drivers/md/dm-table.c b/drivers/md/dm-table.c
> index b36b528e56cff..df904b7e95ce3 100644
> --- a/drivers/md/dm-table.c
> +++ b/drivers/md/dm-table.c
> @@ -1620,13 +1620,11 @@ static bool dm_table_supports_zoned_model(struct dm_table *t,
> static int device_not_matches_zone_sectors(struct dm_target *ti, struct dm_dev *dev,
> sector_t start, sector_t len, void *data)
> {
> - struct request_queue *q = bdev_get_queue(dev->bdev);
> unsigned int *zone_sectors = data;
>
> if (!bdev_is_zoned(dev->bdev))
> return 0;
> -
> - return blk_queue_zone_sectors(q) != *zone_sectors;
> + return bdev_zone_sectors(dev->bdev) != *zone_sectors;
> }
>
> /*
> diff --git a/drivers/md/dm-zone.c b/drivers/md/dm-zone.c
> index 6d105abe12415..842c31019b513 100644
> --- a/drivers/md/dm-zone.c
> +++ b/drivers/md/dm-zone.c
> @@ -334,7 +334,7 @@ static int dm_update_zone_wp_offset_cb(struct blk_zone *zone, unsigned int idx,
> static int dm_update_zone_wp_offset(struct mapped_device *md, unsigned int zno,
> unsigned int *wp_ofst)
> {
> - sector_t sector = zno * blk_queue_zone_sectors(md->queue);
> + sector_t sector = zno * bdev_zone_sectors(md->disk->part0);
> unsigned int noio_flag;
> struct dm_table *t;
> int srcu_idx, ret;
> @@ -373,7 +373,7 @@ struct orig_bio_details {
> static bool dm_zone_map_bio_begin(struct mapped_device *md,
> unsigned int zno, struct bio *clone)
> {
> - sector_t zsectors = blk_queue_zone_sectors(md->queue);
> + sector_t zsectors = bdev_zone_sectors(md->disk->part0);
> unsigned int zwp_offset = READ_ONCE(md->zwp_offset[zno]);
>
> /*
> @@ -443,7 +443,7 @@ static blk_status_t dm_zone_map_bio_end(struct mapped_device *md, unsigned int z
> return BLK_STS_OK;
> case REQ_OP_ZONE_FINISH:
> WRITE_ONCE(md->zwp_offset[zno],
> - blk_queue_zone_sectors(md->queue));
> + bdev_zone_sectors(md->disk->part0));
> return BLK_STS_OK;
> case REQ_OP_WRITE_ZEROES:
> case REQ_OP_WRITE:
> @@ -593,6 +593,7 @@ void dm_zone_endio(struct dm_io *io, struct bio *clone)
> {
> struct mapped_device *md = io->md;
> struct request_queue *q = md->queue;
> + struct gendisk *disk = md->disk;
> struct bio *orig_bio = io->orig_bio;
> unsigned int zwp_offset;
> unsigned int zno;
> @@ -608,7 +609,8 @@ void dm_zone_endio(struct dm_io *io, struct bio *clone)
> */
> if (clone->bi_status == BLK_STS_OK &&
> bio_op(clone) == REQ_OP_ZONE_APPEND) {
> - sector_t mask = (sector_t)blk_queue_zone_sectors(q) - 1;
> + sector_t mask =
> + (sector_t)bdev_zone_sectors(disk->part0) - 1;
>
> orig_bio->bi_iter.bi_sector +=
> clone->bi_iter.bi_sector & mask;
> diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
> index 183aa83143fd2..f1eca3f5610eb 100644
> --- a/include/linux/blkdev.h
> +++ b/include/linux/blkdev.h
> @@ -669,11 +669,6 @@ static inline bool blk_queue_is_zoned(struct request_queue *q)
> }
> }
>
> -static inline sector_t blk_queue_zone_sectors(struct request_queue *q)
> -{
> - return blk_queue_is_zoned(q) ? q->limits.chunk_sectors : 0;
> -}
> -
> #ifdef CONFIG_BLK_DEV_ZONED
> static inline unsigned int blk_queue_nr_zones(struct request_queue *q)
> {
> @@ -1312,9 +1307,9 @@ static inline sector_t bdev_zone_sectors(struct block_device *bdev)
> {
> struct request_queue *q = bdev_get_queue(bdev);
>
> - if (q)
> - return blk_queue_zone_sectors(q);
> - return 0;
> + if (!blk_queue_is_zoned(q))
> + return 0;
> + return q->limits.chunk_sectors;
> }
>
> static inline int queue_dma_alignment(const struct request_queue *q)
--
Damien Le Moal
Western Digital Research
