diff options
| author | David Sterba <dsterba@suse.com> | 2019-06-18 20:00:16 +0200 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2019-07-02 12:30:51 +0200 |
| commit | e749af443fa8dac67a896d38f5eca450a5b9026a (patch) | |
| tree | b838f6e369a0ffdccdacaffe8ac55a36b3ce61dd /fs/btrfs/extent_io.c | |
| parent | e1ea2beee284d8e434e51e60de9e157a18fe8b42 (diff) | |
| download | linux-e749af443fa8dac67a896d38f5eca450a5b9026a.tar.gz linux-e749af443fa8dac67a896d38f5eca450a5b9026a.tar.bz2 linux-e749af443fa8dac67a896d38f5eca450a5b9026a.zip | |
btrfs: lift bio_set_dev from bio allocation helpers
The block device is passed around for the only purpose to set it in new
bios. Move the assignment one level up. This is a preparatory patch for
further bdev cleanups.
Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'fs/btrfs/extent_io.c')
| -rw-r--r-- | fs/btrfs/extent_io.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c index 932d2e0be8d7..1eb671c16ff1 100644 --- a/fs/btrfs/extent_io.c +++ b/fs/btrfs/extent_io.c @@ -2861,12 +2861,11 @@ static inline void btrfs_io_bio_init(struct btrfs_io_bio *btrfs_bio) * never fail. We're returning a bio right now but you can call btrfs_io_bio * for the appropriate container_of magic */ -struct bio *btrfs_bio_alloc(struct block_device *bdev, u64 first_byte) +struct bio *btrfs_bio_alloc(u64 first_byte) { struct bio *bio; bio = bio_alloc_bioset(GFP_NOFS, BIO_MAX_PAGES, &btrfs_bioset); - bio_set_dev(bio, bdev); bio->bi_iter.bi_sector = first_byte >> 9; btrfs_io_bio_init(btrfs_io_bio(bio)); return bio; @@ -2977,7 +2976,8 @@ static int submit_extent_page(unsigned int opf, struct extent_io_tree *tree, } } - bio = btrfs_bio_alloc(bdev, offset); + bio = btrfs_bio_alloc(offset); + bio_set_dev(bio, bdev); bio_add_page(bio, page, page_size, pg_offset); bio->bi_end_io = end_io_func; bio->bi_private = tree; |