On 7/28/22 01:22, Pankaj Raghav wrote:
> Use the bdev_offset_from_zone_start() helper function to calculate
> the offset from zone start instead of using power of 2 based
> calculation.
>
> Signed-off-by: Pankaj Raghav <p.raghav@xxxxxxxxxxx>
> Reviewed-by: Luis Chamberlain <mcgrof@xxxxxxxxxx>
Reviewed-by: Damien Le Moal <damien.lemoal@xxxxxxxxxxxxxxxxxx>
> ---
> drivers/md/dm-zone.c | 9 ++++-----
> 1 file changed, 4 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/md/dm-zone.c b/drivers/md/dm-zone.c
> index 3dafc0e8b7a9..31c16aafdbfc 100644
> --- a/drivers/md/dm-zone.c
> +++ b/drivers/md/dm-zone.c
> @@ -390,7 +390,9 @@ static bool dm_zone_map_bio_begin(struct mapped_device *md,
> case REQ_OP_WRITE_ZEROES:
> case REQ_OP_WRITE:
> /* Writes must be aligned to the zone write pointer */
> - if ((clone->bi_iter.bi_sector & (zsectors - 1)) != zwp_offset)
> + if ((bdev_offset_from_zone_start(md->disk->part0,
> + clone->bi_iter.bi_sector)) != zwp_offset)
> +
> return false;
> break;
> case REQ_OP_ZONE_APPEND:
> @@ -602,11 +604,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)bdev_zone_sectors(disk->part0) - 1;
> -
> orig_bio->bi_iter.bi_sector +=
> - clone->bi_iter.bi_sector & mask;
> + bdev_offset_from_zone_start(disk->part0, clone->bi_iter.bi_sector);
> }
>
> return;
--
Damien Le Moal
Western Digital Research
