On 5/13/25 08:10, Bart Van Assche wrote:
> Improve code readability by using bdev_is_zone_start() and
> bdev_offset_from_zone_start() where applicable. No functionality
> has been changed.
>
> This patch includes a subset of a patch from Pankaj Raghav.
>
> See also
> https://lore.kernel.org/linux-block/[email protected]/.
>
> Cc: Damien Le Moal <[email protected]>
> Cc: Pankaj Raghav <[email protected]>
> Signed-off-by: Bart Van Assche <[email protected]>
> ---
> drivers/md/dm-table.c | 4 ++--
> drivers/md/dm-zone.c | 6 +++---
> 2 files changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/md/dm-table.c b/drivers/md/dm-table.c
> index 6b23e777e10e..4e2a5fe8986f 100644
> --- a/drivers/md/dm-table.c
> +++ b/drivers/md/dm-table.c
> @@ -257,7 +257,7 @@ static int device_area_is_invalid(struct dm_target *ti,
> struct dm_dev *dev,
> if (bdev_is_zoned(bdev)) {
> unsigned int zone_sectors = bdev_zone_sectors(bdev);
>
> - if (start & (zone_sectors - 1)) {
> + if (!bdev_is_zone_start(bdev, start)) {
> DMERR("%s: start=%llu not aligned to h/w zone size %u
> of %pg",
> dm_device_name(ti->table->md),
> (unsigned long long)start,
> @@ -274,7 +274,7 @@ static int device_area_is_invalid(struct dm_target *ti,
> struct dm_dev *dev,
> * devices do not end up with a smaller zone in the middle of
> * the sector range.
> */
> - if (len & (zone_sectors - 1)) {
> + if (!bdev_is_zone_start(bdev, len)) {
This is odd. While the calculation is the same, this checks that the length is
zone aligned. Changing this to testing if length is a zone start sector makes it
hard to understand. So maybe add a synonym helper for that to avoid such odd
naming/code ? E.g.:
/*
* Check if val is aligned to the device zone size.
*/
static inline bool bdev_is_zone_aligned(struct block_device *bdev, sector_t val)
{
return bdev_is_zone_start(bdev, val);
}
Other than this, this looks good to me.
> DMERR("%s: len=%llu not aligned to h/w zone size %u of
> %pg",
> dm_device_name(ti->table->md),
> (unsigned long long)len,
> diff --git a/drivers/md/dm-zone.c b/drivers/md/dm-zone.c
> index 20edd3fabbab..7e184ffba252 100644
> --- a/drivers/md/dm-zone.c
> +++ b/drivers/md/dm-zone.c
> @@ -423,9 +423,9 @@ 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 = bdev_zone_sectors(disk->part0) - 1;
> -
> - orig_bio->bi_iter.bi_sector += clone->bi_iter.bi_sector & mask;
> + orig_bio->bi_iter.bi_sector +=
> + bdev_offset_from_zone_start(disk->part0,
> + clone->bi_iter.bi_sector);
> }
>
> return;
>
--
Damien Le Moal
Western Digital Research
