diff options
| author | Yu Kuai <yukuai3@huawei.com> | 2023-05-29 15:11:02 +0200 |
|---|---|---|
| committer | Song Liu <song@kernel.org> | 2023-06-14 00:25:43 +0200 |
| commit | 8295efbe68c080047e98d9c0eb5cb933b238a8cb (patch) | |
| tree | 7442096e03bf560b894e7373e8cd04cd8136d98f /drivers/md/raid10.c | |
| parent | md/raid1-10: factor out a helper to add bio to plug (diff) | |
| download | linux-8295efbe68c080047e98d9c0eb5cb933b238a8cb.tar.xz linux-8295efbe68c080047e98d9c0eb5cb933b238a8cb.zip | |
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: Yu Kuai <yukuai3@huawei.com>
Signed-off-by: Song Liu <song@kernel.org>
Link: https://lore.kernel.org/r/20230529131106.2123367-4-yukuai1@huaweicloud.com
Diffstat (limited to '')
| -rw-r--r-- | drivers/md/raid10.c | 26 |
1 files changed, 4 insertions, 22 deletions
diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c index b8223da15ca9..21cdb85baba4 100644 --- a/drivers/md/raid10.c +++ b/drivers/md/raid10.c @@ -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(); } |