Commit 8031c3dd authored by Shaohua Li's avatar Shaohua Li

md/bitmap: copy correct data for bitmap super

raid5 cache could write bitmap superblock before bitmap superblock is
initialized. The bitmap superblock is less than 512B. The current code will
only copy the superblock to a new page and write the whole 512B, which will
zero the the data after the superblock. Unfortunately the data could include
bitmap, which we should preserve. The patch will make superblock read do 4k
chunk and we always copy the 4k data to new page, so the superblock write will
old data to disk and we don't change the bitmap.
Reported-by: default avatarSong Liu <songliubraving@fb.com>
Reviewed-by: default avatarSong Liu <songliubraving@fb.com>
Cc: stable@vger.kernel.org (4.10+)
Signed-off-by: default avatarShaohua Li <shli@fb.com>
parent 143c97cc
...@@ -625,7 +625,7 @@ static int bitmap_read_sb(struct bitmap *bitmap) ...@@ -625,7 +625,7 @@ static int bitmap_read_sb(struct bitmap *bitmap)
err = read_sb_page(bitmap->mddev, err = read_sb_page(bitmap->mddev,
offset, offset,
sb_page, sb_page,
0, sizeof(bitmap_super_t)); 0, PAGE_SIZE);
} }
if (err) if (err)
return err; return err;
...@@ -2118,7 +2118,7 @@ int bitmap_resize(struct bitmap *bitmap, sector_t blocks, ...@@ -2118,7 +2118,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),
sizeof(bitmap_super_t)); PAGE_SIZE);
bitmap_file_unmap(&bitmap->storage); bitmap_file_unmap(&bitmap->storage);
bitmap->storage = store; bitmap->storage = store;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment