diff options
| author | NeilBrown <neilb@suse.com> | 2015-07-17 13:26:23 +1000 |
|---|---|---|
| committer | NeilBrown <neilb@suse.com> | 2015-07-24 13:38:04 +1000 |
| commit | e6030cb06c40e4ab4e8c712f13f494a09638ed2c (patch) | |
| tree | 8f87729041def172e57f18ff49ba6b8decd65e90 /drivers/md/raid5.c | |
| parent | 90382ed9afeafd42ef193f0eadc6b2a252d6c24d (diff) | |
| download | op-kernel-dev-e6030cb06c40e4ab4e8c712f13f494a09638ed2c.zip op-kernel-dev-e6030cb06c40e4ab4e8c712f13f494a09638ed2c.tar.gz | |
md/raid5: clear R5_NeedReplace when no longer needed.
This flag is currently never cleared, which can in rare cases
trigger a warn-on if it is still set but the block isn't
InSync.
So clear it when it isn't need, which includes if the replacement
device has failed.
Signed-off-by: NeilBrown <neilb@suse.com>
Diffstat (limited to 'drivers/md/raid5.c')
| -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 38300ee..643d217 100644 --- a/drivers/md/raid5.c +++ b/drivers/md/raid5.c @@ -4066,8 +4066,10 @@ static void analyse_stripe(struct stripe_head *sh, struct stripe_head_state *s) &first_bad, &bad_sectors)) set_bit(R5_ReadRepl, &dev->flags); else { - if (rdev) + if (rdev && !test_bit(Faulty, &rdev->flags)) set_bit(R5_NeedReplace, &dev->flags); + else + clear_bit(R5_NeedReplace, &dev->flags); rdev = rcu_dereference(conf->disks[i].rdev); clear_bit(R5_ReadRepl, &dev->flags); } |
