Skip to content

Commit

Permalink
md/bitmap: move storage allocation from bitmap_load to bitmap_create.
Browse files Browse the repository at this point in the history
We should allocate memory for the storage-bitmap at create-time, not
load time.

Signed-off-by: NeilBrown <neilb@suse.de>
  • Loading branch information
NeilBrown committed May 22, 2012
1 parent d1244cb commit bc9891a
Showing 1 changed file with 6 additions and 5 deletions.
11 changes: 6 additions & 5 deletions drivers/md/bitmap.c
Original file line number Diff line number Diff line change
Expand Up @@ -1032,11 +1032,6 @@ static int bitmap_init_from_disk(struct bitmap *bitmap, sector_t start)
goto err;
}

ret = bitmap_storage_alloc(&bitmap->storage, bitmap->chunks,
!bitmap->mddev->bitmap_info.external);
if (ret)
goto err;

oldindex = ~0L;
offset = 0;
if (!bitmap->mddev->bitmap_info.external)
Expand Down Expand Up @@ -1782,6 +1777,12 @@ int bitmap_create(struct mddev *mddev)
if (!bitmap->bp)
goto error;

if (file || mddev->bitmap_info.offset) {
err = bitmap_storage_alloc(&bitmap->storage, bitmap->chunks,
!mddev->bitmap_info.external);
if (err)
goto error;
}
printk(KERN_INFO "created bitmap (%lu pages) for device %s\n",
pages, bmname(bitmap));

Expand Down

0 comments on commit bc9891a

Please sign in to comment.