mirror of
https://git.yoctoproject.org/meta-ti
synced 2026-07-17 14:57:47 +00:00
Koen Kooi
aefc6c8c3c
The psp tree added a patch to limit the beaglebone to 500MHz when powered by USB, which triggered conflicts in the patches. The 3.2.16 series has been rediffed as well, no functional changes. Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> Signed-off-by: Denys Dmytriyenko <denys@ti.com>
43 lines
1.3 KiB
Diff
43 lines
1.3 KiB
Diff
From b694e091929929c8b56fcb1fbf28cba81dc2fe04 Mon Sep 17 00:00:00 2001
|
|
From: NeilBrown <neilb@suse.de>
|
|
Date: Thu, 12 Apr 2012 16:05:06 +1000
|
|
Subject: [PATCH 10/68] md/bitmap: prevent bitmap_daemon_work running while
|
|
initialising bitmap
|
|
|
|
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(+)
|
|
|
|
diff --git a/drivers/md/bitmap.c b/drivers/md/bitmap.c
|
|
index 2a8722b..62a8e68 100644
|
|
--- 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;
|
|
|
|
+ mutex_lock(&mddev->bitmap_info.mutex);
|
|
err = bitmap_init_from_disk(bitmap, start);
|
|
+ mutex_unlock(&mddev->bitmap_info.mutex);
|
|
|
|
if (err)
|
|
goto out;
|
|
--
|
|
1.7.10
|
|
|