Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7adb072c authored by Tomasz Majchrzak's avatar Tomasz Majchrzak Committed by Shaohua Li
Browse files

raid5: revert commit 11367799 



Revert commit 11367799 ("md: Prevent IO hold during accessing to faulty
raid5 array") as it doesn't comply with commit c3cce6cd ("md/raid5:
ensure device failure recorded before write request returns."). That change
is not required anymore as the problem is resolved by commit 16f88949
("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: default avatarTomasz Majchrzak <tomasz.majchrzak@intel.com>
Signed-off-by: default avatarShaohua Li <shli@fb.com>
parent 91a6c4ad

drivers/md/raid5.c

+1 −3
Original line number Diff line number Diff line
@@ -4645,9 +4645,7 @@ static void handle_stripe(struct stripe_head *sh) 
	}



	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);