md/bitmap: revert a patch
This reverts commit 8031c3ddc7
. That patches doesn't work well if PAGE_SIZE >
4k. We will fix the original problem with a different approach.
Fix: 8031c3ddc70a(md/bitmap: copy correct data for bitmap super)
Reported-by: Joshua Kinard <kumba@gentoo.org>
Cc: stable@vger.kernel.org (4.10+)
Suggested-by: Neil Brown <neilb@suse.com>
Signed-off-by: Shaohua Li <shli@fb.com>
This commit is contained in:
parent
d1d90147c9
commit
938b533d47
|
@ -625,7 +625,7 @@ re_read:
|
||||||
err = read_sb_page(bitmap->mddev,
|
err = read_sb_page(bitmap->mddev,
|
||||||
offset,
|
offset,
|
||||||
sb_page,
|
sb_page,
|
||||||
0, PAGE_SIZE);
|
0, sizeof(bitmap_super_t));
|
||||||
}
|
}
|
||||||
if (err)
|
if (err)
|
||||||
return err;
|
return err;
|
||||||
|
@ -2123,7 +2123,7 @@ int bitmap_resize(struct bitmap *bitmap, sector_t blocks,
|
||||||
if (store.sb_page && bitmap->storage.sb_page)
|
if (store.sb_page && bitmap->storage.sb_page)
|
||||||
memcpy(page_address(store.sb_page),
|
memcpy(page_address(store.sb_page),
|
||||||
page_address(bitmap->storage.sb_page),
|
page_address(bitmap->storage.sb_page),
|
||||||
PAGE_SIZE);
|
sizeof(bitmap_super_t));
|
||||||
bitmap_file_unmap(&bitmap->storage);
|
bitmap_file_unmap(&bitmap->storage);
|
||||||
bitmap->storage = store;
|
bitmap->storage = store;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue