Commit cc396d27 authored by Jens Axboe's avatar Jens Axboe
Browse files

Merge branch 'md-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/song/md into block-5.14 

* 'md-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/song/md:
  md/raid10: properly indicate failure when ending a failed write request
parents 402e0b8c 5ba03936

drivers/md/raid1.c

+0 −2
Original line number Diff line number Diff line
@@ -474,8 +474,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
@@ -471,12 +471,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;