Upstream commit 9c4bdf697c39 ("md/raid6: avoid data corruption during
recovery of double-degraded RAID6") changes handle_stripe(), but we
have separate functions for RAID5 and RAID6 and need to apply the
change to handle_stripe6(). When cherry-picked, the change was
wrongly applied to handle_stripe5().Signed-off-by: Ben Hutchings <[email protected]> --- drivers/md/raid5.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c index 013e598..4d70eef 100644 --- a/drivers/md/raid5.c +++ b/drivers/md/raid5.c @@ -3091,8 +3091,6 @@ static void handle_stripe5(struct stripe_head *sh) set_bit(R5_Wantwrite, &dev->flags); if (prexor) continue; - if (s.failed > 1) - continue; if (!test_bit(R5_Insync, &dev->flags) || (i == sh->pd_idx && s.failed == 0)) set_bit(STRIPE_INSYNC, &sh->state); @@ -3380,6 +3378,8 @@ static void handle_stripe6(struct stripe_head *sh) pr_debug("Writing block %d\n", i); BUG_ON(!test_bit(R5_UPTODATE, &dev->flags)); set_bit(R5_Wantwrite, &dev->flags); + if (s.failed > 1) + continue; if (!test_bit(R5_Insync, &dev->flags) || ((i == sh->pd_idx || i == qd_idx) && s.failed == 0)) -- Ben Hutchings Experience is directly proportional to the value of equipment destroyed. - Carolyn Scheppner
signature.asc
Description: This is a digitally signed message part
