Skip to contentSkip to conversation

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

PATCH RESEND Applied [email protected] 3 participants 3 messages Jun 28, 2021 – Jul 23, 2021 MD RAID

lore
Share & tools
lore
#0 lore raw

PATCH RESEND v2 1/1 md/raid10: properly indicate failure when ending a failed write request

Similar to commit 2417b9869b81882ab90fd5ed1081a1cb2d4db1dd, this patch fixes the same bug in raid10. Also cleanup the comments.

Fixes 7cee6d4e6035 ("md/raid10: end bio when the device faulty")
---
 drivers/md/raid1.c  | 2 --
 drivers/md/raid10.c | 4 ++--
 2 files changed, 2 insertions(+), 4 deletions(-)
drivers/md/raid1.c +0 -2
index ced076ba560e..753822ca9613 100644
@@ -472,8 +472,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
index 13f5e6b2a73d..40e845fb9717 100644
@@ -469,12 +469,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;
Signature · 1 line
2.32.0
Acked-by on v2 1/1
#1 lore raw
Quoted 32 lines · On 6/28/21 3:15 PM, [email protected] wrote:

Similar to commit 2417b9869b81882ab90fd5ed1081a1cb2d4db1dd, this patch fixes the same bug in raid10. Also cleanup the comments.

Fixes 7cee6d4e6035 ("md/raid10: end bio when the device faulty")
---
  drivers/md/raid1.c  | 2 --
  drivers/md/raid10.c | 4 ++--
  2 files changed, 2 insertions(+), 4 deletions(-)
drivers/md/raid1.c +0 -2
index ced076ba560e..753822ca9613 100644
@@ -472,8 +472,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 +0 -1
index 13f5e6b2a73d..40e845fb9717 100644
@@ -469,12 +469,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,

drivers/md/raid10.c static void raid10_end_write_request(struct bio *bio) · line 480

Quoted 10 lines
drivers/md/raid10.c +2 -1
-			 * 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;

Thanks,
Guoqing

maintainer Applied
#2 lore raw
Quoted 9 lines · Guoqing Jiang
Quoted 5 lines · On 6/28/21 3:15 PM, [email protected] wrote:

Similar to commit 2417b9869b81882ab90fd5ed1081a1cb2d4db1dd, this patch fixes the same bug in raid10. Also cleanup the comments.

Fixes 7cee6d4e6035 ("md/raid10: end bio when the device faulty")

Applied to md-next.

I fixed some issues highlighted by checkpatch.pl. For the next time, please run checkpatch.pl before sending the patch.

Thanks,
Song

Quoted 42 lines
Quoted 27 lines
---
  drivers/md/raid1.c  | 2 --
  drivers/md/raid10.c | 4 ++--
  2 files changed, 2 insertions(+), 4 deletions(-)
drivers/md/raid1.c +0 -2
index ced076ba560e..753822ca9613 100644
@@ -472,8 +472,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 +0 -1
index 13f5e6b2a73d..40e845fb9717 100644
@@ -469,12 +469,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,

drivers/md/raid10.c static void raid10_end_write_request(struct bio *bio) · line 480

Quoted 10 lines
drivers/md/raid10.c +2 -1
-                      * 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;

Thanks,
Guoqing