3.0-stable patches

added patches:
	md-bitmap-prevent-bitmap_daemon_work-running-while-initialising-bitmap.patch

diff --git a/queue-3.0/md-bitmap-prevent-bitmap_daemon_work-running-while-initialising-bitmap.patch b/queue-3.0/md-bitmap-prevent-bitmap_daemon_work-running-while-initialising-bitmap.patch
new file mode 100644 (file)
index 0000000..e45c403
--- /dev/null
+++ b/queue-3.0/md-bitmap-prevent-bitmap_daemon_work-running-while-initialising-bitmap.patch
@@ -0,0 +1,39 @@
+From afbaa90b80b1ec66e5137cc3824746bfdf559b18 Mon Sep 17 00:00:00 2001
+From: NeilBrown <neilb@suse.de>
+Date: Thu, 12 Apr 2012 16:05:06 +1000
+Subject: md/bitmap: prevent bitmap_daemon_work running while initialising bitmap
+
+From: NeilBrown <neilb@suse.de>
+
+commit afbaa90b80b1ec66e5137cc3824746bfdf559b18 upstream.
+
+If a bitmap is added while the array is active, it is possible
+for bitmap_daemon_work to run while the bitmap is being
+initialised.
+This is particularly a problem if bitmap_daemon_work sees
+bitmap->filemap as non-NULL before it has been filled in properly.
+So hold bitmap_info.mutex while filling in ->filemap
+to prevent problems.
+
+This patch is suitable for any -stable kernel, though it might not
+apply cleanly before about 3.1.
+
+Signed-off-by: NeilBrown <neilb@suse.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/md/bitmap.c |    2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/drivers/md/bitmap.c
++++ b/drivers/md/bitmap.c
+@@ -1897,7 +1897,9 @@ int bitmap_load(mddev_t *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;

diff --git a/queue-3.0/series b/queue-3.0/series
index 507e47af64dadfe1b9b4535d42e9c8859bfdeea2..bc5deda2e2144732a5889ff8e04e2c31bf827aef 100644 (file)
--- a/queue-3.0/series
+++ b/queue-3.0/series
@@ -50,3 +50,4 @@ pch_dma-fix-channel-locking.patch
 pch_dma-fix-ctl-register-access-issue.patch
 pch_dma-fix-suspend-issue.patch
 pch_dma-support-new-device-lapis-semiconductor-ml7831-ioh.patch
+md-bitmap-prevent-bitmap_daemon_work-running-while-initialising-bitmap.patch