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

Commit 1b7b9713 authored by Wei Shuyu's avatar Wei Shuyu Committed by Greg Kroah-Hartman
Browse files

md/raid10: properly indicate failure when ending a failed write request 



commit 5ba03936c05584b6f6f79be5ebe7e5036c1dd252 upstream.

Similar to [1], this patch fixes the same bug in raid10. Also cleanup the
comments.

[1] commit 2417b9869b81 ("md/raid1: properly indicate failure when ending
                         a failed write request")
Cc: stable@vger.kernel.org
Fixes: 7cee6d4e ("md/raid10: end bio when the device faulty")
Signed-off-by: default avatarWei Shuyu <wsy@dogben.com>
Acked-by: default avatarGuoqing Jiang <jiangguoqing@kylinos.cn>
Signed-off-by: default avatarSong Liu <song@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 790cb68d

drivers/md/raid1.c

+0 −2
Original line number Diff line number Diff line
@@ -452,8 +452,6 @@ static void raid1_end_write_request(struct bio *bio) 
		/*

		 * When the device is faulty, it is not necessary to

		 * handle write error.

		 * For failfast, this is the only remaining device,

		 * We need to retry the write without FailFast.

		 */

		if (!test_bit(Faulty, &rdev->flags))

			set_bit(R1BIO_WriteError, &r1_bio->state);

drivers/md/raid10.c

+2 −2
Original line number Diff line number Diff line
@@ -470,12 +470,12 @@ static void raid10_end_write_request(struct bio *bio) 
			/*

			 * When the device is faulty, it is not necessary to

			 * handle write error.

			 * For failfast, this is the only remaining device,

			 * We need to retry the write without FailFast.

			 */

			if (!test_bit(Faulty, &rdev->flags))

				set_bit(R10BIO_WriteError, &r10_bio->state);

			else {

				/* Fail the request */

				set_bit(R10BIO_Degraded, &r10_bio->state);

				r10_bio->devs[slot].bio = NULL;

				to_put = bio;

				dec_rdev = 1;