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

Commit 5d81a787 authored by Dmitry Torokhov's avatar Dmitry Torokhov
Browse files

Merge branch 'ib/4.17-bitmap' into next 

Bring in bitmap API improvements.
parents 955c594e c42b65e3

drivers/md/dm-raid.c

+3 −3
Original line number Diff line number Diff line
@@ -3859,7 +3859,7 @@ static int __load_dirty_region_bitmap(struct raid_set *rs) 
	/* Try loading the bitmap unless "raid0", which does not have one */

	if (!rs_is_raid0(rs) &&

	    !test_and_set_bit(RT_FLAG_RS_BITMAP_LOADED, &rs->runtime_flags)) {

		r = bitmap_load(&rs->md);

		r = md_bitmap_load(&rs->md);

		if (r)

			DMERR("Failed to load bitmap");

	}
@@ -3987,7 +3987,7 @@ static int raid_preresume(struct dm_target *ti) 
	/* Resize bitmap to adjust to changed region size (aka MD bitmap chunksize) */

	if (test_bit(RT_FLAG_RS_BITMAP_LOADED, &rs->runtime_flags) && mddev->bitmap &&

	    mddev->bitmap_info.chunksize != to_bytes(rs->requested_bitmap_chunk_sectors)) {

		r = bitmap_resize(mddev->bitmap, mddev->dev_sectors,

		r = md_bitmap_resize(mddev->bitmap, mddev->dev_sectors,

				     to_bytes(rs->requested_bitmap_chunk_sectors), 0);

		if (r)

			DMERR("Failed to resize bitmap");