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

[ Upstream commit 8295efbe68c080047e98d9c0eb5cb933b238a8cb ]

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
Stable-dep-of: 7db922bae3ab ("md/raid1-10: submit write io directly if bitmap is not enabled")
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/md/raid1-10.c b/drivers/md/raid1-10.c
index 9bf19a3..506299b 100644 (file)
--- a/drivers/md/raid1-10.c
+++ b/drivers/md/raid1-10.c
@@ -110,6 +110,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)
 {

diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
index f3f2078..ac64c58 100644 (file)
--- a/drivers/md/raid1.c
+++ b/drivers/md/raid1.c
@@ -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();
        }

diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c
index 14001cc..ea6228f 100644 (file)
--- 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;
                }
                blk_finish_plug(&plug);
@@ -1136,17 +1127,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;
        }
        kfree(plug);