Skip to content

md/raid5: fix parity corruption on journal failure #230

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kpd-daemon wants to merge 1 commit into
base: md-6.16_base
Choose a base branch
from
Open

md/raid5: fix parity corruption on journal failure #230

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions drivers/md/raid5.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1146,9 +1146,21 @@ static void ops_run_io(struct stripe_head *sh, struct stripe_head_state *s)

might_sleep();

/* Successfully logged to journal */
if (log_stripe(sh, s) == 0)
return;

/*
* Journal device failed. Only abort writes if we have
* too many failed devices to maintain consistency.
*/
if (conf->log && r5l_log_disk_error(conf) &&
s->failed > conf->max_degraded &&
(s->to_write || s->written)) {
set_bit(STRIPE_HANDLE, &sh->state);
return;
}

should_defer = conf->batch_bio_dispatch && conf->group_cnt;

for (i = disks; i--; ) {
Expand Down Expand Up @@ -3672,6 +3684,13 @@ handle_failed_stripe(struct r5conf *conf, struct stripe_head *sh,
* still be locked - so just clear all R5_LOCKED flags
*/
clear_bit(R5_LOCKED, &sh->dev[i].flags);
/* Clear R5_Want* flags to prevent stale operations
* from executing on retry.
*/
clear_bit(R5_Wantwrite, &sh->dev[i].flags);
clear_bit(R5_Wantcompute, &sh->dev[i].flags);
clear_bit(R5_WantFUA, &sh->dev[i].flags);
clear_bit(R5_Wantdrain, &sh->dev[i].flags);
}
s->to_write = 0;
s->written = 0;
Expand Down