diff options
| author | NeilBrown <neilb@suse.de> | 2010-06-01 19:37:35 +1000 |
|---|---|---|
| committer | NeilBrown <neilb@suse.de> | 2010-07-26 13:21:34 +1000 |
| commit | 69e51b449d383e97b1b9f890f8378c96e9e17346 (patch) | |
| tree | 650123fa4f08e8fa7f348a4ca875c59c129e5d84 /drivers/md/md.c | |
| parent | e384e58549a2e9a83071ad80280c1a9053cfd84c (diff) | |
| download | linux-69e51b449d383e97b1b9f890f8378c96e9e17346.tar.bz2 | |
md/bitmap: separate out loading a bitmap from initialising the structures.
dm makes this distinction between ->ctr and ->resume, so we need to
too.
Also get the new bitmap_load to clear out the bitmap first, as this is
most consistent with the dm suspend/resume approach
Signed-off-by: NeilBrown <neilb@suse.de>
Diffstat (limited to 'drivers/md/md.c')
| -rw-r--r-- | drivers/md/md.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/drivers/md/md.c b/drivers/md/md.c index 9d4e44e460e9..40b7ca0294ac 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c @@ -4594,7 +4594,11 @@ static int do_md_run(mddev_t *mddev) err = md_run(mddev); if (err) goto out; - + err = bitmap_load(mddev); + if (err) { + bitmap_destroy(mddev); + goto out; + } set_capacity(mddev->gendisk, mddev->array_sectors); revalidate_disk(mddev->gendisk); kobject_uevent(&disk_to_dev(mddev->gendisk)->kobj, KOBJ_CHANGE); @@ -5382,8 +5386,11 @@ static int set_bitmap_file(mddev_t *mddev, int fd) err = 0; if (mddev->pers) { mddev->pers->quiesce(mddev, 1); - if (fd >= 0) + if (fd >= 0) { err = bitmap_create(mddev); + if (!err) + err = bitmap_load(mddev); + } if (fd < 0 || err) { bitmap_destroy(mddev); fd = -1; /* make sure to put the file */ @@ -5632,6 +5639,8 @@ static int update_array_info(mddev_t *mddev, mdu_array_info_t *info) mddev->bitmap_info.default_offset; mddev->pers->quiesce(mddev, 1); rv = bitmap_create(mddev); + if (!rv) + rv = bitmap_load(mddev); if (rv) bitmap_destroy(mddev); mddev->pers->quiesce(mddev, 0); |