aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/md/raid5.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
index 1fb28c56457a..2c8907706109 100644
--- a/drivers/md/raid5.c
+++ b/drivers/md/raid5.c
@@ -2056,6 +2056,9 @@ static void raid5_end_read_request(struct bio * bi, int error)
2056 mdname(conf->mddev), bdn); 2056 mdname(conf->mddev), bdn);
2057 else 2057 else
2058 retry = 1; 2058 retry = 1;
2059 if (set_bad && test_bit(In_sync, &rdev->flags)
2060 && !test_bit(R5_ReadNoMerge, &sh->dev[i].flags))
2061 retry = 1;
2059 if (retry) 2062 if (retry)
2060 if (test_bit(R5_ReadNoMerge, &sh->dev[i].flags)) { 2063 if (test_bit(R5_ReadNoMerge, &sh->dev[i].flags)) {
2061 set_bit(R5_ReadError, &sh->dev[i].flags); 2064 set_bit(R5_ReadError, &sh->dev[i].flags);