Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'for-linus' of git://neil.brown.name/md
* 'for-linus' of git://neil.brown.name/md:
md: restore ability of spare drives to spin down.
md/raid6: Fix raid-6 read-error correction in degraded state
+9
-3
+8
-2
drivers/md/md.c
+8
-2
drivers/md/md.c
···
2109
2109
if (!mddev->in_sync || mddev->recovery_cp != MaxSector) { /* not clean */
2110
2110
/* .. if the array isn't clean, an 'even' event must also go
2111
2111
* to spares. */
2112
-
if ((mddev->events&1)==0)
2112
+
if ((mddev->events&1)==0) {
2113
2113
nospares = 0;
2114
+
sync_req = 2; /* force a second update to get the
2115
+
* even/odd in sync */
2116
+
}
2114
2117
} else {
2115
2118
/* otherwise an 'odd' event must go to spares */
2116
-
if ((mddev->events&1))
2119
+
if ((mddev->events&1)) {
2117
2120
nospares = 0;
2121
+
sync_req = 2; /* force a second update to get the
2122
+
* even/odd in sync */
2123
+
}
2118
2124
}
2119
2125
}
2120
2126
+1
-1
drivers/md/raid5.c
+1
-1
drivers/md/raid5.c
···
1527
1527
1528
1528
clear_bit(R5_UPTODATE, &sh->dev[i].flags);
1529
1529
atomic_inc(&rdev->read_errors);
1530
-
if (conf->mddev->degraded)
1530
+
if (conf->mddev->degraded >= conf->max_degraded)
1531
1531
printk_rl(KERN_WARNING
1532
1532
"raid5:%s: read error not correctable "
1533
1533
"(sector %llu on %s).\n",