Attachment 1486781 Details for Bug 1537033 – Don't jump to compute_result state from check_result state

[patch] Don't jump to compute_result state from check_result state

md_raid6_fix.patch (text/plain), 1.32 KB, created by David Jeffery on 2018-09-25 15:29:49 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: David Jeffery

Created: 2018-09-25 15:29:49 UTC

Size: 1.32 KB

patch

obsolete

>built against commit b36fdc6853a38a6f8749897a33435635019e0647
>diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
>index 4ce0d7502fad..3e2bdc8a32d6 100644
>--- a/drivers/md/raid5.c
>+++ b/drivers/md/raid5.c
>@@ -4221,26 +4221,15 @@ static void handle_parity_checks6(struct r5conf *conf, struct stripe_head *sh,
> 	case check_state_check_result:
> 		sh->check_state = check_state_idle;
> 
>+		if (s->failed > 1)
>+			break;
> 		/* handle a successful check operation, if parity is correct
> 		 * we are done.  Otherwise update the mismatch count and repair
> 		 * parity if !MD_RECOVERY_CHECK
> 		 */
> 		if (sh->ops.zero_sum_result == 0) {
>-			/* both parities are correct */
>-			if (!s->failed)
>-				set_bit(STRIPE_INSYNC, &sh->state);
>-			else {
>-				/* in contrast to the raid5 case we can validate
>-				 * parity, but still have a failure to write
>-				 * back
>-				 */
>-				sh->check_state = check_state_compute_result;
>-				/* Returning at this point means that we may go
>-				 * off and bring p and/or q uptodate again so
>-				 * we make sure to check zero_sum_result again
>-				 * to verify if p or q need writeback
>-				 */
>-			}
>+			/* Any parity checked was correct */
>+			set_bit(STRIPE_INSYNC, &sh->state);
> 		} else {
> 			atomic64_add(STRIPE_SECTORS, &conf->mddev->resync_mismatches);
> 			if (test_bit(MD_RECOVERY_CHECK, &conf->mddev->recovery)) {

Actions: View | Diff

Attachments on bug 1537033: 1486781