From: LongPing Wei <weilongping@oppo.com>
Date: Thu, 7 Nov 2024 02:04:41 +0000 (+0800)
Subject: block: get wp_offset by bdev_offset_from_zone_start
X-Git-Tag: nvme-6.13-2024-12-31~5
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=790eb09e59709a1ffc1c64fe4aae2789120851b0;p=nvme.git

block: get wp_offset by bdev_offset_from_zone_start

Call bdev_offset_from_zone_start() instead of open-coding it.

Fixes: dd291d77cc90 ("block: Introduce zone write plugging")
Signed-off-by: LongPing Wei <weilongping@oppo.com>
Reviewed-by: Damien Le Moal <dlemoal@kernel.org>
Reviewed-by: Bart Van Assche <bvanassche@acm.org>
Link: https://lore.kernel.org/r/20241107020439.1644577-1-weilongping@oppo.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
---

diff --git a/block/blk-zoned.c b/block/blk-zoned.c
index 77f12fc2086f..84da1eadff64 100644
--- a/block/blk-zoned.c
+++ b/block/blk-zoned.c
@@ -555,7 +555,7 @@ again:
 	spin_lock_init(&zwplug->lock);
 	zwplug->flags = 0;
 	zwplug->zone_no = zno;
-	zwplug->wp_offset = sector & (disk->queue->limits.chunk_sectors - 1);
+	zwplug->wp_offset = bdev_offset_from_zone_start(disk->part0, sector);
 	bio_list_init(&zwplug->bio_list);
 	INIT_WORK(&zwplug->bio_work, blk_zone_wplug_bio_work);
 	zwplug->disk = disk;