From d9321dab4201fdda7ffd0ebb7cadd7384c531643 Mon Sep 17 00:00:00 2001
From: NeilBrown <neilb@suse.de>
Date: Thu, 12 Apr 2012 16:05:06 +1000
Subject: [PATCH] --- yaml --- r: 298985 b: refs/heads/master c:
 afbaa90b80b1ec66e5137cc3824746bfdf559b18 h: refs/heads/master i:   298983:
 dfab8e8468ce8a1cfb7520e657d6b6dfc525d7a8 v: v3

---
 [refs]                    | 2 +-
 trunk/drivers/md/bitmap.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index c21c2da36c81..bec17a0db3a9 100644
--- 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
index 1c264a701e70..97e73e555d11 100644
--- 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;