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

Commit da6fb7a9 authored by NeilBrown's avatar NeilBrown
Browse files

md/bitmap: don't pass -1 to bitmap_storage_alloc. 



Passing -1 to bitmap_storage_alloc() causes page->index to be set to
-1, which is quite problematic.

So only pass ->cluster_slot if mddev_is_clustered().

Fixes: b97e9257 ("Use separate bitmaps for each nodes in the cluster")
Cc: stable@vger.kernel.org (v4.1+)
Signed-off-by: default avatarNeilBrown <neilb@suse.com>
parent e8ff8bf0

drivers/md/bitmap.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -1997,7 +1997,8 @@ int bitmap_resize(struct bitmap *bitmap, sector_t blocks, 
	if (bitmap->mddev->bitmap_info.offset || bitmap->mddev->bitmap_info.file)

	if (bitmap->mddev->bitmap_info.offset || bitmap->mddev->bitmap_info.file)

		ret = bitmap_storage_alloc(&store, chunks,

		ret = bitmap_storage_alloc(&store, chunks,

					   !bitmap->mddev->bitmap_info.external,

					   !bitmap->mddev->bitmap_info.external,

					   bitmap->cluster_slot);

					   mddev_is_clustered(bitmap->mddev)

					   ? bitmap->cluster_slot : 0);

	if (ret)

	if (ret)

		goto err;

		goto err;