Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[linux-2.6-microblaze.git] / drivers / md / dm-raid.c

diff --git a/drivers/md/dm-raid.c b/drivers/md/dm-raid.c
index 75df4c9..cae689d 100644 (file)
--- a/drivers/md/dm-raid.c
+++ b/drivers/md/dm-raid.c
@@ -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,8 +3987,8 @@ 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,
-                                 to_bytes(rs->requested_bitmap_chunk_sectors), 0);
+               r = md_bitmap_resize(mddev->bitmap, mddev->dev_sectors,
+                                    to_bytes(rs->requested_bitmap_chunk_sectors), 0);
                if (r)
                        DMERR("Failed to resize bitmap");
        }