>From 09b869282f477a7d645949383f591a0ddf801b26 Mon Sep 17 00:00:00 2001
From: Adam Kwolek <adam.kwolek@xxxxxxxxx>
Date: Tue, 23 Feb 2010 11:29:04 +0100
Subject: [PATCH] OLCE: Rebuild FIX
Changes to be committed:
modified: managemon.c
modified: monitor.c
Rebuild and OLCE has a conflict for Raid0 (when not fully initialized) array
(not monitored, but visible to monitor for a while)
In such case no degradation check (without breaking rebuild)
Signed-off-by: Adam Kwolek <adam.kwolek@xxxxxxxxx>
---
managemon.c | 10 ++++++++--
monitor.c | 3 ++-
2 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/managemon.c b/managemon.c
index b42a00b..5a4117f 100644
--- a/managemon.c
+++ b/managemon.c
@@ -437,7 +437,8 @@ static void manage_member(struct mdstat_ent *mdstat,
if ((a->takeover == requested) && (a->container)) {
struct metadata_update *updates = NULL;
int level_before_takeover = a->container->ss->takeover(a, &updates);
- if (level_before_takeover != a->curr_level) {
+ if ((level_before_takeover != a->curr_level) &&
+ (level_before_takeover > -1)) {
/* maintain return level after reshape */
if (a->reshape_return_level > -1) {
/* check if return level can be cleaned */
@@ -561,8 +562,13 @@ static void manage_member(struct mdstat_ent *mdstat,
a->check_degraded = 0;
- if (a->reshape_return_level <= 0)
+ /* if current array level is 0
+ * possible in result of takeover (it will be changed in a while)
+ * so we do not chack for degradation
+ */
+ if (a->curr_level == 0)
goto out;
+
/* The array may not be degraded, this is just a good time
* to check.
*/
diff --git a/monitor.c b/monitor.c
index 7742202..be889a3 100644
--- a/monitor.c
+++ b/monitor.c
@@ -277,7 +277,8 @@ static int read_and_act(struct active_array *a)
a->takeover = none;
}
- if (a->takeover == none) {
+ if ((a->takeover == none) &&
+ (a->prev_level > -1)) {
/* check for raid level change */
if (a->curr_level != a->prev_level) {
/* start takeover procedure */
--
1.6.0.2
--
To unsubscribe from this list: send the line "unsubscribe linux-raid" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
