diff options
| author |   Shaohua Li <shli@fb.com> | 2017-10-16 19:03:44 -0700 |
|---|---|---|
| committer | Shaohua Li <shli@fb.com> | 2017-10-16 19:03:44 -0700 |
| commit | 938b533d479e7428b7fa1b8179283646d2e2c53d (patch) | |
| tree | 073a2a6c5c9977697977ba69d93c13abb4337d34 | |
| parent | md: always set THREAD_WAKEUP and wake up wqueue if thread existed (diff) | |
| download | linux-dev-938b533d479e7428b7fa1b8179283646d2e2c53d.tar.xz linux-dev-938b533d479e7428b7fa1b8179283646d2e2c53d.zip | |
md/bitmap: revert a patch
This reverts commit 8031c3ddc70a. 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>
| -rw-r--r-- | drivers/md/bitmap.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/md/bitmap.c b/drivers/md/bitmap.c index d2121637b4ab..cae57b5be817 100644 --- a/drivers/md/bitmap.c +++ b/drivers/md/bitmap.c @@ -625,7 +625,7 @@ re_read: 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; |