git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mtd: nand: davinci: Reinitialize the HW ECC engine in 4bit hwctl
[pandora-kernel.git]
/
drivers
/
md
/
bitmap.c
diff --git
a/drivers/md/bitmap.c
b/drivers/md/bitmap.c
index
6d03774
..
62a8e68
100644
(file)
--- a/
drivers/md/bitmap.c
+++ b/
drivers/md/bitmap.c
@@
-1819,7
+1819,9
@@
int bitmap_load(struct mddev *mddev)
* re-add of a missing device */
start = mddev->recovery_cp;
* re-add of a missing device */
start = mddev->recovery_cp;
+ mutex_lock(&mddev->bitmap_info.mutex);
err = bitmap_init_from_disk(bitmap, start);
err = bitmap_init_from_disk(bitmap, start);
+ mutex_unlock(&mddev->bitmap_info.mutex);
if (err)
goto out;
if (err)
goto out;
@@
-1904,6
+1906,8
@@
location_store(struct mddev *mddev, const char *buf, size_t len)
if (mddev->pers) {
mddev->pers->quiesce(mddev, 1);
rv = bitmap_create(mddev);
if (mddev->pers) {
mddev->pers->quiesce(mddev, 1);
rv = bitmap_create(mddev);
+ if (!rv)
+ rv = bitmap_load(mddev);
if (rv) {
bitmap_destroy(mddev);
mddev->bitmap_info.offset = 0;
if (rv) {
bitmap_destroy(mddev);
mddev->bitmap_info.offset = 0;