---

yaml --- r: 298985 b: refs/heads/master c: afbaa90 h: refs/heads/master i: 298983: dfab8e8 v: v3
git-mirror · Apr 12, 2012 · d9321da · d9321da
1 parent 8ab7bfd
commit d9321da
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f4380a915823dbed0bf8e3cf502ebcf2b7c7f833
+refs/heads/master: afbaa90b80b1ec66e5137cc3824746bfdf559b18
diff --git a/trunk/drivers/md/bitmap.c b/trunk/drivers/md/bitmap.c
@@ -1785,7 +1785,9 @@ int bitmap_load(struct mddev *mddev)
 		 * re-add of a missing device */
 		start = mddev->recovery_cp;
 
+	mutex_lock(&mddev->bitmap_info.mutex);
 	err = bitmap_init_from_disk(bitmap, start);
+	mutex_unlock(&mddev->bitmap_info.mutex);
 
 	if (err)
 		goto out;