[PATCH] md: simplify code with bio_io_error

[PATCH] md: simplify code with bio_io_error

[Guoqing Jiang]

bio_io_error was introduced in the commit 4246a0b
("block: add a bi_error field to struct bio"), so
use it to simplify code.

Signed-off-by: Guoqing Jiang <gqjiang@suse.com>
---
 drivers/md/raid1.c  | 3 +--
 drivers/md/raid10.c | 3 +--
 drivers/md/raid5.c  | 3 +--
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
index af5056d..c20eb78 100644
--- a/drivers/md/raid1.c
+++ b/drivers/md/raid1.c
@@ -802,8 +802,7 @@ static void flush_bio_list(struct r1conf *conf, struct bio *bio)
 		bio->bi_next = NULL;
 		bio->bi_bdev = rdev->bdev;
 		if (test_bit(Faulty, &rdev->flags)) {
-			bio->bi_error = -EIO;
-			bio_endio(bio);
+			bio_io_error(bio);
 		} else if (unlikely((bio_op(bio) == REQ_OP_DISCARD) &&
 				    !blk_queue_discard(bdev_get_queue(bio->bi_bdev))))
 			/* Just ignore it */
diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c
index 4343d7f..ceb9709 100644
--- a/drivers/md/raid10.c
+++ b/drivers/md/raid10.c
@@ -913,8 +913,7 @@ static void flush_pending_writes(struct r10conf *conf)
 			bio->bi_next = NULL;
 			bio->bi_bdev = rdev->bdev;
 			if (test_bit(Faulty, &rdev->flags)) {
-				bio->bi_error = -EIO;
-				bio_endio(bio);
+				bio_io_error(bio);
 			} else if (unlikely((bio_op(bio) ==  REQ_OP_DISCARD) &&
 					    !blk_queue_discard(bdev_get_queue(bio->bi_bdev))))
 				/* Just ignore it */
diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
index 7220646..57aa044 100644
--- a/drivers/md/raid5.c
+++ b/drivers/md/raid5.c
@@ -3429,8 +3429,7 @@ handle_failed_stripe(struct r5conf *conf, struct stripe_head *sh,
 				struct bio *nextbi =
 					r5_next_bio(bi, sh->dev[i].sector);
 
-				bi->bi_error = -EIO;
-				bio_endio(bi);
+				bio_io_error(bi);
 				bi = nextbi;
 			}
 		}
-- 
2.10.0

Re: [PATCH] md: simplify code with bio_io_error

[Shaohua Li]

On Fri, Jun 02, 2017 at 03:49:14PM +0800, Guoqing Jiang wrote:
> bio_io_error was introduced in the commit 4246a0b
> ("block: add a bi_error field to struct bio"), so
> use it to simplify code.
> 
> Signed-off-by: Guoqing Jiang <gqjiang@suse.com>

Applied, thanks! There are several other places which could use conversion, I added
too.

> ---
>  drivers/md/raid1.c  | 3 +--
>  drivers/md/raid10.c | 3 +--
>  drivers/md/raid5.c  | 3 +--
>  3 files changed, 3 insertions(+), 6 deletions(-)
> 
> diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
> index af5056d..c20eb78 100644
> --- a/drivers/md/raid1.c
> +++ b/drivers/md/raid1.c
> @@ -802,8 +802,7 @@ static void flush_bio_list(struct r1conf *conf, struct bio *bio)
>  		bio->bi_next = NULL;
>  		bio->bi_bdev = rdev->bdev;
>  		if (test_bit(Faulty, &rdev->flags)) {
> -			bio->bi_error = -EIO;
> -			bio_endio(bio);
> +			bio_io_error(bio);
>  		} else if (unlikely((bio_op(bio) == REQ_OP_DISCARD) &&
>  				    !blk_queue_discard(bdev_get_queue(bio->bi_bdev))))
>  			/* Just ignore it */
> diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c
> index 4343d7f..ceb9709 100644
> --- a/drivers/md/raid10.c
> +++ b/drivers/md/raid10.c
> @@ -913,8 +913,7 @@ static void flush_pending_writes(struct r10conf *conf)
>  			bio->bi_next = NULL;
>  			bio->bi_bdev = rdev->bdev;
>  			if (test_bit(Faulty, &rdev->flags)) {
> -				bio->bi_error = -EIO;
> -				bio_endio(bio);
> +				bio_io_error(bio);
>  			} else if (unlikely((bio_op(bio) ==  REQ_OP_DISCARD) &&
>  					    !blk_queue_discard(bdev_get_queue(bio->bi_bdev))))
>  				/* Just ignore it */
> diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
> index 7220646..57aa044 100644
> --- a/drivers/md/raid5.c
> +++ b/drivers/md/raid5.c
> @@ -3429,8 +3429,7 @@ handle_failed_stripe(struct r5conf *conf, struct stripe_head *sh,
>  				struct bio *nextbi =
>  					r5_next_bio(bi, sh->dev[i].sector);
>  
> -				bi->bi_error = -EIO;
> -				bio_endio(bi);
> +				bio_io_error(bi);
>  				bi = nextbi;
>  			}
>  		}
> -- 
> 2.10.0
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-raid" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH] md: simplify code with bio_io_error

[Christoph Hellwig]

On Fri, Jun 02, 2017 at 09:29:26AM -0700, Shaohua Li wrote:
> On Fri, Jun 02, 2017 at 03:49:14PM +0800, Guoqing Jiang wrote:
> > bio_io_error was introduced in the commit 4246a0b
> > ("block: add a bi_error field to struct bio"), so
> > use it to simplify code.
> > 
> > Signed-off-by: Guoqing Jiang <gqjiang@suse.com>
> 
> Applied, thanks! There are several other places which could use conversion, I added

Ugg.  I have a massive series pending for the block layer that changes
the error values.  Applying these cleanups now will just introduce
conflicts all over.

Re: [PATCH] md: simplify code with bio_io_error

[Guoqing Jiang]

On 06/03/2017 01:57 PM, Christoph Hellwig wrote:
> On Fri, Jun 02, 2017 at 09:29:26AM -0700, Shaohua Li wrote:
>> On Fri, Jun 02, 2017 at 03:49:14PM +0800, Guoqing Jiang wrote:
>>> bio_io_error was introduced in the commit 4246a0b
>>> ("block: add a bi_error field to struct bio"), so
>>> use it to simplify code.
>>>
>>> Signed-off-by: Guoqing Jiang <gqjiang@suse.com>
>> Applied, thanks! There are several other places which could use conversion, I added
> Ugg.  I have a massive series pending for the block layer that changes
> the error values.  Applying these cleanups now will just introduce
> conflicts all over.
>

Hmm, I suppose you mean the thread with subject "dedicated error codes 
for the block layer"
which replace bi_error with bi_status. I can resend it on top of the 
thread, or maybe you can
add the changes in your patches directly.

Thanks,
Guoqing