Commit 8295efbe authored by Yu Kuai's avatar Yu Kuai Committed by Song Liu
Browse files

md/raid1-10: factor out a helper to submit normal write 



There are multiple places to do the same thing, factor out a helper to
prevent redundant code, and the helper will be used in following patch
as well.

Signed-off-by: default avatarYu Kuai <yukuai3@huawei.com>
Signed-off-by: default avatarSong Liu <song@kernel.org>
Link: https://lore.kernel.org/r/20230529131106.2123367-4-yukuai1@huaweicloud.com
parent 5ec6ca14

drivers/md/raid1-10.c

+17 −0
Original line number Diff line number Diff line
@@ -111,6 +111,23 @@ static void md_bio_reset_resync_pages(struct bio *bio, struct resync_pages *rp, 
	} while (idx++ < RESYNC_PAGES && size > 0);

}





static inline void raid1_submit_write(struct bio *bio)

{

	struct md_rdev *rdev = (struct md_rdev *)bio->bi_bdev;



	bio->bi_next = NULL;

	bio_set_dev(bio, rdev->bdev);

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

		bio_io_error(bio);

	else if (unlikely(bio_op(bio) ==  REQ_OP_DISCARD &&

			  !bdev_max_discard_sectors(bio->bi_bdev)))

		/* Just ignore it */

		bio_endio(bio);

	else

		submit_bio_noacct(bio);

}



static inline bool raid1_add_bio_to_plug(struct mddev *mddev, struct bio *bio,

				      blk_plug_cb_fn unplug)

{

drivers/md/raid1.c

+2 −11
Original line number Diff line number Diff line
@@ -799,17 +799,8 @@ static void flush_bio_list(struct r1conf *conf, struct bio *bio) 


	while (bio) { /* submit pending writes */

		struct bio *next = bio->bi_next;

		struct md_rdev *rdev = (void *)bio->bi_bdev;

		bio->bi_next = NULL;

		bio_set_dev(bio, rdev->bdev);

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

			bio_io_error(bio);

		} else if (unlikely((bio_op(bio) == REQ_OP_DISCARD) &&

				    !bdev_max_discard_sectors(bio->bi_bdev)))

			/* Just ignore it */

			bio_endio(bio);

		else

			submit_bio_noacct(bio);



		raid1_submit_write(bio);

		bio = next;

		cond_resched();

	}

drivers/md/raid10.c

+4 −22
Original line number Diff line number Diff line
@@ -917,17 +917,8 @@ static void flush_pending_writes(struct r10conf *conf) 


		while (bio) { /* submit pending writes */

			struct bio *next = bio->bi_next;

			struct md_rdev *rdev = (void*)bio->bi_bdev;

			bio->bi_next = NULL;

			bio_set_dev(bio, rdev->bdev);

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

				bio_io_error(bio);

			} else if (unlikely((bio_op(bio) ==  REQ_OP_DISCARD) &&

					    !bdev_max_discard_sectors(bio->bi_bdev)))

				/* Just ignore it */

				bio_endio(bio);

			else

				submit_bio_noacct(bio);



			raid1_submit_write(bio);

			bio = next;

			cond_resched();

		}
@@ -1142,17 +1133,8 @@ static void raid10_unplug(struct blk_plug_cb *cb, bool from_schedule) 


	while (bio) { /* submit pending writes */

		struct bio *next = bio->bi_next;

		struct md_rdev *rdev = (void*)bio->bi_bdev;

		bio->bi_next = NULL;

		bio_set_dev(bio, rdev->bdev);

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

			bio_io_error(bio);

		} else if (unlikely((bio_op(bio) ==  REQ_OP_DISCARD) &&

				    !bdev_max_discard_sectors(bio->bi_bdev)))

			/* Just ignore it */

			bio_endio(bio);

		else

			submit_bio_noacct(bio);



		raid1_submit_write(bio);

		bio = next;

		cond_resched();

	}