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

Commit 6308d8e3 authored by Guoqing Jiang's avatar Guoqing Jiang Committed by Shaohua Li
Browse files

md: simplify code with bio_io_error 



Since bio_io_error sets bi_status to BLK_STS_IOERR,
and calls bio_endio, so we can use it directly.

And as mentioned by Shaohua, there are also two
places in raid5.c can use bio_io_error either.

Signed-off-by: default avatarGuoqing Jiang <gqjiang@suse.com>
Signed-off-by: default avatarShaohua Li <shli@fb.com>
parent 16d56e2f

drivers/md/raid1.c

+1 −2
Original line number Diff line number Diff line
@@ -790,8 +790,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_status = BLK_STS_IOERR;

			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 */

drivers/md/raid10.c

+2 −4
Original line number Diff line number Diff line
@@ -905,8 +905,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_status = BLK_STS_IOERR;

				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 */
@@ -1090,8 +1089,7 @@ static void raid10_unplug(struct blk_plug_cb *cb, bool from_schedule) 
		bio->bi_next = NULL;

		bio->bi_bdev = rdev->bdev;

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

			bio->bi_status = BLK_STS_IOERR;

			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 */

drivers/md/raid5.c

+3 −6
Original line number Diff line number Diff line
@@ -3381,9 +3381,8 @@ handle_failed_stripe(struct r5conf *conf, struct stripe_head *sh, 
			sh->dev[i].sector + STRIPE_SECTORS) {

			struct bio *nextbi = r5_next_bio(bi, sh->dev[i].sector);



			bi->bi_status = BLK_STS_IOERR;

			md_write_end(conf->mddev);

			bio_endio(bi);

			bio_io_error(bi);

			bi = nextbi;

		}

		if (bitmap_end)
@@ -3403,9 +3402,8 @@ handle_failed_stripe(struct r5conf *conf, struct stripe_head *sh, 
		       sh->dev[i].sector + STRIPE_SECTORS) {

			struct bio *bi2 = r5_next_bio(bi, sh->dev[i].sector);



			bi->bi_status = BLK_STS_IOERR;

			md_write_end(conf->mddev);

			bio_endio(bi);

			bio_io_error(bi);

			bi = bi2;

		}
@@ -3429,8 +3427,7 @@ handle_failed_stripe(struct r5conf *conf, struct stripe_head *sh, 
				struct bio *nextbi =

					r5_next_bio(bi, sh->dev[i].sector);



				bi->bi_status = BLK_STS_IOERR;

				bio_endio(bi);

				bio_io_error(bi);

				bi = nextbi;

			}

		}