md: remove bio_alloc_mddev

bio_alloc_mddev is never called with a NULL mddev, and ->bio_set is
initialized in md_run, so it always must be initialized as well.  Just
open code the remaining call to bio_alloc_bioset.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Acked-by: Song Liu <song@kernel.org>
Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Reviewed-by: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
Acked-by: Damien Le Moal <damien.lemoal@wdc.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/drivers/md/md.c b/drivers/md/md.c
index 7d1bb24add31076e7bc0ec4a2f283959f9fad4d5..e2b9dbb6e888f609acb4afd758b24dd7bfc22c47 100644 (file)
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -340,16 +340,6 @@ static int start_readonly;
  */
 static bool create_on_open = true;
 
-struct bio *bio_alloc_mddev(gfp_t gfp_mask, int nr_iovecs,
-                           struct mddev *mddev)
-{
-       if (!mddev || !bioset_initialized(&mddev->bio_set))
-               return bio_alloc(gfp_mask, nr_iovecs);
-
-       return bio_alloc_bioset(gfp_mask, nr_iovecs, &mddev->bio_set);
-}
-EXPORT_SYMBOL_GPL(bio_alloc_mddev);
-
 static struct bio *md_bio_alloc_sync(struct mddev *mddev)
 {
        if (!mddev || !bioset_initialized(&mddev->sync_set))
@@ -613,7 +603,7 @@ static void submit_flushes(struct work_struct *ws)
                        atomic_inc(&rdev->nr_pending);
                        atomic_inc(&rdev->nr_pending);
                        rcu_read_unlock();
-                       bi = bio_alloc_mddev(GFP_NOIO, 0, mddev);
+                       bi = bio_alloc_bioset(GFP_NOIO, 0, &mddev->bio_set);
                        bi->bi_end_io = md_end_flush;
                        bi->bi_private = rdev;
                        bio_set_dev(bi, rdev->bdev);

diff --git a/drivers/md/md.h b/drivers/md/md.h
index f13290ccc1c248592a0384620831522d4c8cb8cc..bcbba1b5ec4a710e7c4c212ca82f229e0c79b964 100644 (file)
--- a/drivers/md/md.h
+++ b/drivers/md/md.h
@@ -742,8 +742,6 @@ extern void md_rdev_clear(struct md_rdev *rdev);
 extern void md_handle_request(struct mddev *mddev, struct bio *bio);
 extern void mddev_suspend(struct mddev *mddev);
 extern void mddev_resume(struct mddev *mddev);
-extern struct bio *bio_alloc_mddev(gfp_t gfp_mask, int nr_iovecs,
-                                  struct mddev *mddev);
 
 extern void md_reload_sb(struct mddev *mddev, int raid_disk);
 extern void md_update_sb(struct mddev *mddev, int force);

diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
index 3b19141cdb4bc225473c376050a7ac001f488521..d2378765dc154fa4f738c3d867022d32f3cb2a48 100644 (file)
--- a/drivers/md/raid1.c
+++ b/drivers/md/raid1.c
@@ -1104,7 +1104,7 @@ static void alloc_behind_master_bio(struct r1bio *r1_bio,
        int i = 0;
        struct bio *behind_bio = NULL;
 
-       behind_bio = bio_alloc_mddev(GFP_NOIO, vcnt, r1_bio->mddev);
+       behind_bio = bio_alloc_bioset(GFP_NOIO, vcnt, &r1_bio->mddev->bio_set);
        if (!behind_bio)
                return;
 

diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c
index be8f14afb6d14310554e5c1dc30fda8e47ac7814..e1eefbec15d4446244a82862d904f02ed04cc729 100644 (file)
--- a/drivers/md/raid10.c
+++ b/drivers/md/raid10.c
@@ -4531,7 +4531,7 @@ read_more:
                return sectors_done;
        }
 
-       read_bio = bio_alloc_mddev(GFP_KERNEL, RESYNC_PAGES, mddev);
+       read_bio = bio_alloc_bioset(GFP_KERNEL, RESYNC_PAGES, &mddev->bio_set);
 
        bio_set_dev(read_bio, rdev->bdev);
        read_bio->bi_iter.bi_sector = (r10_bio->devs[r10_bio->read_slot].addr