From a913096decbf4101271e7d87b9affb1454bb7676 Mon Sep 17 00:00:00 2001

From: Zhao Heming <heming.zhao@suse.com>

Date: Tue, 6 Oct 2020 00:00:23 +0800

Subject: [PATCH] md/bitmap: md_bitmap_read_sb uses wrong bitmap blocks

Git-commit: a913096decbf4101271e7d87b9affb1454bb7676

Patch-mainline: v5.10-rc1

References: bsc#1163727

The patched code is used to get chunks number, should use round-up div

to replace current sector_div. The same code is in md_bitmap_resize():

```

chunks = DIV_ROUND_UP_SECTOR_T(blocks, 1 << chunkshift);

```

Signed-off-by: Zhao Heming <heming.zhao@suse.com>

Signed-off-by: Song Liu <songliubraving@fb.com>

---

 drivers/md/md-bitmap.c | 4 ++--

 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/md/md-bitmap.c b/drivers/md/md-bitmap.c

index 55b757a223a4..cd9a12ca281d 100644

--- a/drivers/md/md-bitmap.c

+++ b/drivers/md/md-bitmap.c

@@ -606,8 +606,8 @@ static int md_bitmap_read_sb(struct bitmap *bitmap)

 	if (bitmap->cluster_slot >= 0) {

 		sector_t bm_blocks = bitmap->mddev->resync_max_sectors;

-		sector_div(bm_blocks,

-			   bitmap->mddev->bitmap_info.chunksize >> 9);

+		bm_blocks = DIV_ROUND_UP_SECTOR_T(bm_blocks,

+			   (bitmap->mddev->bitmap_info.chunksize >> 9));

 		/* bits to bytes */

 		bm_blocks = ((bm_blocks+7) >> 3) + sizeof(bitmap_super_t);

 		/* to 4k blocks */

-- 

1.8.3.1