diff options
| author | Alex Shi <alex.shi@linaro.org> | 2015-03-10 09:33:40 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2015-03-10 09:48:38 +0800 |
| commit | 42f504e28a169ebfea0e3d9c6e151451800e41d5 (patch) | |
| tree | d01c160e4e9a5c094e91706ab60651e26098fb60 /drivers/md/raid5.c | |
| parent | c810fcb930d9c705774427bb6eb551b2e1108adb (diff) | |
| parent | 389fb5fb0b8b812ce0e853d5eca748b08fc73289 (diff) | |
Merge tag 'v3.10.71' into linux-linaro-lsk
This is the 3.10.71 stable release
Conflicts:
arch/arm64/kernel/setup.c
Diffstat (limited to 'drivers/md/raid5.c')
| -rw-r--r-- | drivers/md/raid5.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c index 4daf5c03b33b..1b6986ce5da9 100644 --- a/drivers/md/raid5.c +++ b/drivers/md/raid5.c @@ -2853,7 +2853,8 @@ static void handle_stripe_dirtying(struct r5conf *conf, * generate correct data from the parity. */ if (conf->max_degraded == 2 || - (recovery_cp < MaxSector && sh->sector >= recovery_cp)) { + (recovery_cp < MaxSector && sh->sector >= recovery_cp && + s->failed == 0)) { /* Calculate the real rcw later - for now make it * look like rcw is cheaper */ |