2023-04-21 19:59:04

by Luis Chamberlain

Subject: [PATCH 2/5] drbd: use PAGE_SECTORS_SHIFT and PAGE_SECTORS

Replace common constants with generic versions.
This produces no functional changes.

Signed-off-by: Luis Chamberlain <[email protected]>
---
drivers/block/drbd/drbd_bitmap.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/block/drbd/drbd_bitmap.c b/drivers/block/drbd/drbd_bitmap.c
index 6ac8c54b44c7..b556e6634f13 100644
--- a/drivers/block/drbd/drbd_bitmap.c
+++ b/drivers/block/drbd/drbd_bitmap.c
@@ -1000,7 +1000,7 @@ static void bm_page_io_async(struct drbd_bm_aio_ctx *ctx, int page_nr) __must_ho
unsigned int len;

first_bm_sect = device->ldev->md.md_offset + device->ldev->md.bm_offset;
- on_disk_sector = first_bm_sect + (((sector_t)page_nr) << (PAGE_SHIFT-SECTOR_SHIFT));
+ on_disk_sector = first_bm_sect + (((sector_t)page_nr) << PAGE_SECTORS_SHIFT);

/* this might happen with very small
* flexible external meta data device,
@@ -1008,7 +1008,7 @@ static void bm_page_io_async(struct drbd_bm_aio_ctx *ctx, int page_nr) __must_ho
last_bm_sect = drbd_md_last_bitmap_sector(device->ldev);
if (first_bm_sect <= on_disk_sector && last_bm_sect >= on_disk_sector) {
sector_t len_sect = last_bm_sect - on_disk_sector + 1;
- if (len_sect < PAGE_SIZE/SECTOR_SIZE)
+ if (len_sect < PAGE_SECTORS)
len = (unsigned int)len_sect*SECTOR_SIZE;
else
len = PAGE_SIZE;
--
2.39.2

2023-04-24 08:37:44

by Christoph Böhmwalder

Subject: Re: [PATCH 2/5] drbd: use PAGE_SECTORS_SHIFT and PAGE_SECTORS

Am 21.04.23 um 21:58 schrieb Luis Chamberlain:
> Replace common constants with generic versions.
> This produces no functional changes.
>
> Signed-off-by: Luis Chamberlain <[email protected]>
> ---
> drivers/block/drbd/drbd_bitmap.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/block/drbd/drbd_bitmap.c b/drivers/block/drbd/drbd_bitmap.c
> index 6ac8c54b44c7..b556e6634f13 100644
> --- a/drivers/block/drbd/drbd_bitmap.c
> +++ b/drivers/block/drbd/drbd_bitmap.c
> @@ -1000,7 +1000,7 @@ static void bm_page_io_async(struct drbd_bm_aio_ctx *ctx, int page_nr) __must_ho
> unsigned int len;
>
> first_bm_sect = device->ldev->md.md_offset + device->ldev->md.bm_offset;
> - on_disk_sector = first_bm_sect + (((sector_t)page_nr) << (PAGE_SHIFT-SECTOR_SHIFT));
> + on_disk_sector = first_bm_sect + (((sector_t)page_nr) << PAGE_SECTORS_SHIFT);
>
> /* this might happen with very small
> * flexible external meta data device,
> @@ -1008,7 +1008,7 @@ static void bm_page_io_async(struct drbd_bm_aio_ctx *ctx, int page_nr) __must_ho
> last_bm_sect = drbd_md_last_bitmap_sector(device->ldev);
> if (first_bm_sect <= on_disk_sector && last_bm_sect >= on_disk_sector) {
> sector_t len_sect = last_bm_sect - on_disk_sector + 1;
> - if (len_sect < PAGE_SIZE/SECTOR_SIZE)
> + if (len_sect < PAGE_SECTORS)
> len = (unsigned int)len_sect*SECTOR_SIZE;
> else
> len = PAGE_SIZE;

Acked-by: Christoph Böhmwalder <[email protected]>

--
Christoph Böhmwalder
LINBIT | Keeping the Digital World Running
DRBD HA — Disaster Recovery — Software defined Storage