summaryrefslogtreecommitdiffstats
path: root/drivers/md/md.c
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2010-05-13 09:56:24 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2010-05-13 09:56:24 +0100
commit74b8721099992b76d3faff78cb8a5d13c65c3529 (patch)
tree2c9971160051cae98237715f791ce2b93a0720b5 /drivers/md/md.c
parent4bddaf66093ce0e0c1fce505f091f4cd52e73e2e (diff)
parentbaffe1699c68da5040de6b274054adc995795782 (diff)
downloadkernel-crypto-74b8721099992b76d3faff78cb8a5d13c65c3529.tar.gz
kernel-crypto-74b8721099992b76d3faff78cb8a5d13c65c3529.tar.xz
kernel-crypto-74b8721099992b76d3faff78cb8a5d13c65c3529.zip
Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel-stable
Diffstat (limited to 'drivers/md/md.c')
-rw-r--r--drivers/md/md.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/drivers/md/md.c b/drivers/md/md.c
index 9712b2e97be..cefd63daff3 100644
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -2109,12 +2109,18 @@ repeat:
if (!mddev->in_sync || mddev->recovery_cp != MaxSector) { /* not clean */
/* .. if the array isn't clean, an 'even' event must also go
* to spares. */
- if ((mddev->events&1)==0)
+ if ((mddev->events&1)==0) {
nospares = 0;
+ sync_req = 2; /* force a second update to get the
+ * even/odd in sync */
+ }
} else {
/* otherwise an 'odd' event must go to spares */
- if ((mddev->events&1))
+ if ((mddev->events&1)) {
nospares = 0;
+ sync_req = 2; /* force a second update to get the
+ * even/odd in sync */
+ }
}
}