diff options
| author |   NeilBrown <neilb@suse.de> | 2015-05-08 18:19:33 +1000 |
|---|---|---|
| committer | NeilBrown <neilb@suse.de> | 2015-05-08 18:47:17 +1000 |
| commit | 10d82c5f0d167ef75a2d8d7d4eed9ee43d3369c9 (patch) | |
| tree | 0aa8aa74575cd2ff2028030fb830a8e73f5574c6 /drivers/md | |
| parent | md/raid5: more incorrect BUG_ON in handle_stripe_fill. (diff) | |
| download | linux-dev-10d82c5f0d167ef75a2d8d7d4eed9ee43d3369c9.tar.xz linux-dev-10d82c5f0d167ef75a2d8d7d4eed9ee43d3369c9.zip | |
md/raid5: avoid reading parity blocks for full-stripe write to degraded array
When performing a reconstruct write, we need to read all blocks
that are not being over-written .. except the parity (P and Q) blocks.
The code currently reads these (as they are not being over-written!)
unnecessarily.
Signed-off-by: NeilBrown <neilb@suse.de>
Fixes: ea664c8245f3 ("md/raid5: need_this_block: tidy/fix last condition.")
Diffstat (limited to 'drivers/md')
| -rw-r--r-- | drivers/md/raid5.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c index 415cac6d89bd..85dc0e67fb88 100644 --- a/drivers/md/raid5.c +++ b/drivers/md/raid5.c @@ -3282,7 +3282,9 @@ static int need_this_block(struct stripe_head *sh, struct stripe_head_state *s, /* reconstruct-write isn't being forced */ return 0; for (i = 0; i < s->failed; i++) { - if (!test_bit(R5_UPTODATE, &fdev[i]->flags) && + if (s->failed_num[i] != sh->pd_idx && + s->failed_num[i] != sh->qd_idx && + !test_bit(R5_UPTODATE, &fdev[i]->flags) && !test_bit(R5_OVERWRITE, &fdev[i]->flags)) return 1; } |