md/bitmap: revert a patch

This reverts commit 8031c3d. That patches doesn't work well if PAGE_SIZE > 4k. We will fix the original problem with a different approach. Fix: 8031c3d(md/bitmap: copy correct data for bitmap super) Reported-by: Joshua Kinard <[email protected]> Cc: [email protected] (4.10+) Suggested-by: Neil Brown <[email protected]> Signed-off-by: Shaohua Li <[email protected]>
tadfisher · Oct 17, 2017 · 938b533 · 938b533
1 parent d1d9014
commit 938b533
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/drivers/md/bitmap.c b/drivers/md/bitmap.c
@@ -625,7 +625,7 @@ static int bitmap_read_sb(struct bitmap *bitmap)
 		err = read_sb_page(bitmap->mddev,
 				   offset,
 				   sb_page,
-				   0, PAGE_SIZE);
+				   0, sizeof(bitmap_super_t));
 	}
 	if (err)
 		return err;
@@ -2123,7 +2123,7 @@ int bitmap_resize(struct bitmap *bitmap, sector_t blocks,
 	if (store.sb_page && bitmap->storage.sb_page)
 		memcpy(page_address(store.sb_page),
 		       page_address(bitmap->storage.sb_page),
-		       PAGE_SIZE);
+		       sizeof(bitmap_super_t));
 	bitmap_file_unmap(&bitmap->storage);
 	bitmap->storage = store;