summaryrefslogtreecommitdiffstats
path: root/monitor.c
diff options
context:
space:
mode:
authorNeil Brown <neilb@suse.de>2008-06-12 10:13:32 +1000
committerNeil Brown <neilb@suse.de>2008-06-12 10:13:32 +1000
commit7e1432fb14bb7d362821b8c62dd282e67c536efe (patch)
tree3703df447fe50a1e1f255dec81925724e1830f67 /monitor.c
parent6c3fb95c44ffc36df4048db86231521146417223 (diff)
downloadmdadm-7e1432fb14bb7d362821b8c62dd282e67c536efe.tar.gz
mdadm-7e1432fb14bb7d362821b8c62dd282e67c536efe.tar.xz
mdadm-7e1432fb14bb7d362821b8c62dd282e67c536efe.zip
Add DDF code for activate_spare
Plus various bug fixes etc.
Diffstat (limited to 'monitor.c')
-rw-r--r--monitor.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/monitor.c b/monitor.c
index 690afa0..5a95149 100644
--- a/monitor.c
+++ b/monitor.c
@@ -271,7 +271,6 @@ static int read_and_act(struct active_array *a)
}
}
-
for (mdi = a->info.devs ; mdi ; mdi = mdi->next) {
if (mdi->curr_state & DS_FAULTY) {
a->container->ss->set_disk(a, mdi->disk.raid_disk,
@@ -281,12 +280,6 @@ static int read_and_act(struct active_array *a)
}
}
- if (check_degraded) {
- /* manager will do the actual check */
- a->check_degraded = 1;
- signal_manager();
- }
-
a->container->ss->sync_metadata(a->container);
/* Effect state changes in the array */
@@ -323,6 +316,12 @@ static int read_and_act(struct active_array *a)
mdi->next_state = 0;
}
+ if (check_degraded) {
+ /* manager will do the actual check */
+ a->check_degraded = 1;
+ signal_manager();
+ }
+
if (deactivate)
a->container = NULL;