diff options
author | NeilBrown <neilb@suse.com> | 2015-07-16 23:26:23 -0400 |
---|---|---|
committer | NeilBrown <neilb@suse.com> | 2015-07-23 23:38:04 -0400 |
commit | e6030cb06c40e4ab4e8c712f13f494a09638ed2c (patch) | |
tree | 8f87729041def172e57f18ff49ba6b8decd65e90 /drivers/md/raid5.c | |
parent | 90382ed9afeafd42ef193f0eadc6b2a252d6c24d (diff) |
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 38300ee3c4e1..643d217bfa13 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) | |||
4066 | &first_bad, &bad_sectors)) | 4066 | &first_bad, &bad_sectors)) |
4067 | set_bit(R5_ReadRepl, &dev->flags); | 4067 | set_bit(R5_ReadRepl, &dev->flags); |
4068 | else { | 4068 | else { |
4069 | if (rdev) | 4069 | if (rdev && !test_bit(Faulty, &rdev->flags)) |
4070 | set_bit(R5_NeedReplace, &dev->flags); | 4070 | set_bit(R5_NeedReplace, &dev->flags); |
4071 | else | ||
4072 | clear_bit(R5_NeedReplace, &dev->flags); | ||
4071 | rdev = rcu_dereference(conf->disks[i].rdev); | 4073 | rdev = rcu_dereference(conf->disks[i].rdev); |
4072 | clear_bit(R5_ReadRepl, &dev->flags); | 4074 | clear_bit(R5_ReadRepl, &dev->flags); |
4073 | } | 4075 | } |