Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Christoph Hellwig and committed by
Jens Axboe
a78f18da ae7153f1

+3 -15
+1 -11
drivers/md/md.c
··· 340 340 */ 341 341 static bool create_on_open = true; 342 342 343 - struct bio *bio_alloc_mddev(gfp_t gfp_mask, int nr_iovecs, 344 - struct mddev *mddev) 345 - { 346 - if (!mddev || !bioset_initialized(&mddev->bio_set)) 347 - return bio_alloc(gfp_mask, nr_iovecs); 348 - 349 - return bio_alloc_bioset(gfp_mask, nr_iovecs, &mddev->bio_set); 350 - } 351 - EXPORT_SYMBOL_GPL(bio_alloc_mddev); 352 - 353 343 static struct bio *md_bio_alloc_sync(struct mddev *mddev) 354 344 { 355 345 if (!mddev || !bioset_initialized(&mddev->sync_set)) ··· 603 613 atomic_inc(&rdev->nr_pending); 604 614 atomic_inc(&rdev->nr_pending); 605 615 rcu_read_unlock(); 606 - bi = bio_alloc_mddev(GFP_NOIO, 0, mddev); 616 + bi = bio_alloc_bioset(GFP_NOIO, 0, &mddev->bio_set); 607 617 bi->bi_end_io = md_end_flush; 608 618 bi->bi_private = rdev; 609 619 bio_set_dev(bi, rdev->bdev);
-2
drivers/md/md.h
··· 742 742 extern void md_handle_request(struct mddev *mddev, struct bio *bio); 743 743 extern void mddev_suspend(struct mddev *mddev); 744 744 extern void mddev_resume(struct mddev *mddev); 745 - extern struct bio *bio_alloc_mddev(gfp_t gfp_mask, int nr_iovecs, 746 - struct mddev *mddev); 747 745 748 746 extern void md_reload_sb(struct mddev *mddev, int raid_disk); 749 747 extern void md_update_sb(struct mddev *mddev, int force);
+1 -1
drivers/md/raid1.c
··· 1104 1104 int i = 0; 1105 1105 struct bio *behind_bio = NULL; 1106 1106 1107 - behind_bio = bio_alloc_mddev(GFP_NOIO, vcnt, r1_bio->mddev); 1107 + behind_bio = bio_alloc_bioset(GFP_NOIO, vcnt, &r1_bio->mddev->bio_set); 1108 1108 if (!behind_bio) 1109 1109 return; 1110 1110
+1 -1
drivers/md/raid10.c
··· 4531 4531 return sectors_done; 4532 4532 } 4533 4533 4534 - read_bio = bio_alloc_mddev(GFP_KERNEL, RESYNC_PAGES, mddev); 4534 + read_bio = bio_alloc_bioset(GFP_KERNEL, RESYNC_PAGES, &mddev->bio_set); 4535 4535 4536 4536 bio_set_dev(read_bio, rdev->bdev); 4537 4537 read_bio->bi_iter.bi_sector = (r10_bio->devs[r10_bio->read_slot].addr