diff options
| author | Tomasz Majchrzak <tomasz.majchrzak@intel.com> | 2016-10-26 09:20:39 +0200 |
|---|---|---|
| committer | Shaohua Li <shli@fb.com> | 2016-11-07 15:08:21 -0800 |
| commit | 7adb072ca83d71103ecc8578bee5f73c4f1eba89 (patch) | |
| tree | ec7e826ae93a19ddc7758527c34d69641a548c82 /drivers/md/raid5.c | |
| parent | 91a6c4aded58cb49f99320480bad62493c288761 (diff) | |
raid5: revert commit 11367799f3d1
Revert commit 11367799f3d1 ("md: Prevent IO hold during accessing to faulty
raid5 array") as it doesn't comply with commit c3cce6cda162 ("md/raid5:
ensure device failure recorded before write request returns."). That change
is not required anymore as the problem is resolved by commit 16f889499a52
("md: report 'write_pending' state when array in sync") - read request is
stuck as array state is not reported correctly via sysfs attribute.
Signed-off-by: Tomasz Majchrzak <tomasz.majchrzak@intel.com>
Signed-off-by: Shaohua Li <shli@fb.com>
Diffstat (limited to 'drivers/md/raid5.c')
| -rw-r--r-- | drivers/md/raid5.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c index 92ac251e91e6..b6e4670624b8 100644 --- a/drivers/md/raid5.c +++ b/drivers/md/raid5.c @@ -4645,9 +4645,7 @@ finish: } if (!bio_list_empty(&s.return_bi)) { - if (test_bit(MD_CHANGE_PENDING, &conf->mddev->flags) && - (s.failed <= conf->max_degraded || - conf->mddev->external == 0)) { + if (test_bit(MD_CHANGE_PENDING, &conf->mddev->flags)) { spin_lock_irq(&conf->device_lock); bio_list_merge(&conf->return_bi, &s.return_bi); spin_unlock_irq(&conf->device_lock); |