summaryrefslogtreecommitdiffstats
path: root/drivers/md
diff options
context:
space:
mode:
authorNeilBrown <neilb@suse.de>2011-10-26 10:31:04 +1100
committerNeilBrown <neilb@suse.de>2011-10-26 10:31:04 +1100
commit355840e7a7e56bb2834fd3b0da64da5465f8aeaa (patch)
tree8ba816b2db3b96872f744c476c3d3d0d3f12fd23 /drivers/md
parentbd860c53d4f9cad520d233e1ba690aaacfb39e9b (diff)
downloadlinux-355840e7a7e56bb2834fd3b0da64da5465f8aeaa.tar.bz2
md/raid5: fix bug that could result in reads from a failed device.
This bug was introduced in 415e72d034c50520ddb7ff79e7d1792c1306f0c9 which was in 2.6.36. There is a small window of time between when a device fails and when it is removed from the array. During this time we might still read from it, but we won't write to it - so it is possible that we could read stale data. We didn't need the test of 'Faulty' before because the test on In_sync is sufficient. Since we started allowing reads from the early part of non-In_sync devices we need a test on Faulty too. This is suitable for any kernel from 2.6.36 onwards, though the patch might need a bit of tweaking in 3.0 and earlier. Cc: stable@kernel.org Signed-off-by: NeilBrown <neilb@suse.de>
Diffstat (limited to 'drivers/md')
-rw-r--r--drivers/md/raid5.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
index eea9379f7fae..521bf2605f82 100644
--- a/drivers/md/raid5.c
+++ b/drivers/md/raid5.c
@@ -3062,7 +3062,7 @@ static void analyse_stripe(struct stripe_head *sh, struct stripe_head_state *s)
}
} else if (test_bit(In_sync, &rdev->flags))
set_bit(R5_Insync, &dev->flags);
- else {
+ else if (!test_bit(Faulty, &rdev->flags)) {
/* in sync if before recovery_offset */
if (sh->sector + STRIPE_SECTORS <= rdev->recovery_offset)
set_bit(R5_Insync, &dev->flags);