Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a6ff2fb4 authored by Shaohua Li's avatar Shaohua Li Committed by Greg Kroah-Hartman
Browse files

md/bitmap: revert a patch 



commit 938b533d479e7428b7fa1b8179283646d2e2c53d upstream.

This reverts commit 8031c3dd. That patches doesn't work well if PAGE_SIZE >
4k. We will fix the original problem with a different approach.

Fix: 8031c3dd(md/bitmap: copy correct data for bitmap super)
Reported-by: default avatarJoshua Kinard <kumba@gentoo.org>
Suggested-by: default avatarNeil Brown <neilb@suse.com>
Signed-off-by: default avatarShaohua Li <shli@fb.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 5912d9ca

drivers/md/bitmap.c

+2 −2
Original line number Diff line number Diff line
@@ -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;