Commit a78f18da authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

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: default avatarChristoph Hellwig <hch@lst.de>
Acked-by: default avatarSong Liu <song@kernel.org>
Reviewed-by: default avatarJohannes Thumshirn <johannes.thumshirn@wdc.com>
Reviewed-by: default avatarChaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
Acked-by: default avatarDamien Le Moal <damien.lemoal@wdc.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent ae7153f1

drivers/md/md.c

+1 −11
Original line number Diff line number Diff line
@@ -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);

drivers/md/md.h

+0 −2
Original line number Diff line number Diff line
@@ -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);

drivers/md/raid1.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

drivers/md/raid10.c

+1 −1
Original line number Diff line number Diff line
@@ -4531,7 +4531,7 @@ static sector_t reshape_request(struct mddev *mddev, sector_t sector_nr, 
		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