Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b54ffb73 authored by Kent Overstreet's avatar Kent Overstreet Committed by Jens Axboe
Browse files

block: remove bio_get_nr_vecs() 



We can always fill up the bio now, no need to estimate the possible
size based on queue parameters.

Acked-by: default avatarSteven Whitehouse <swhiteho@redhat.com>
Signed-off-by: default avatarKent Overstreet <kent.overstreet@gmail.com>
[hch: rebased and wrote a changelog]
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarMing Lin <ming.l@ssi.samsung.com>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent 6cf66b4c

block/bio.c

+0 −23
Original line number Diff line number Diff line
@@ -693,29 +693,6 @@ struct bio *bio_clone_bioset(struct bio *bio_src, gfp_t gfp_mask, 
}

EXPORT_SYMBOL(bio_clone_bioset);



/**

 *	bio_get_nr_vecs		- return approx number of vecs

 *	@bdev:  I/O target

 *

 *	Return the approximate number of pages we can send to this target.

 *	There's no guarantee that you will be able to fit this number of pages

 *	into a bio, it does not account for dynamic restrictions that vary

 *	on offset.

 */

int bio_get_nr_vecs(struct block_device *bdev)

{

	struct request_queue *q = bdev_get_queue(bdev);

	int nr_pages;



	nr_pages = min_t(unsigned,

		     queue_max_segments(q),

		     queue_max_sectors(q) / (PAGE_SIZE >> 9) + 1);



	return min_t(unsigned, nr_pages, BIO_MAX_PAGES);



}

EXPORT_SYMBOL(bio_get_nr_vecs);



/**

 *	bio_add_pc_page	-	attempt to add page to bio

 *	@q: the target queue

drivers/md/dm-io.c

+1 −1
Original line number Diff line number Diff line
@@ -316,7 +316,7 @@ static void do_region(int rw, unsigned region, struct dm_io_region *where, 
		if ((rw & REQ_DISCARD) || (rw & REQ_WRITE_SAME))

			num_bvecs = 1;

		else

			num_bvecs = min_t(int, bio_get_nr_vecs(where->bdev),

			num_bvecs = min_t(int, BIO_MAX_PAGES,

					  dm_sector_div_up(remaining, (PAGE_SIZE >> SECTOR_SHIFT)));



		bio = bio_alloc_bioset(GFP_NOIO, num_bvecs, io->client->bios);

fs/btrfs/compression.c

+1 −4
Original line number Diff line number Diff line
@@ -97,10 +97,7 @@ static inline int compressed_bio_size(struct btrfs_root *root, 
static struct bio *compressed_bio_alloc(struct block_device *bdev,

					u64 first_byte, gfp_t gfp_flags)

{

	int nr_vecs;



	nr_vecs = bio_get_nr_vecs(bdev);

	return btrfs_bio_alloc(bdev, first_byte >> 9, nr_vecs, gfp_flags);

	return btrfs_bio_alloc(bdev, first_byte >> 9, BIO_MAX_PAGES, gfp_flags);

}



static int check_compressed_csum(struct inode *inode,

fs/btrfs/extent_io.c

+2 −7
Original line number Diff line number Diff line
@@ -2795,9 +2795,7 @@ static int submit_extent_page(int rw, struct extent_io_tree *tree, 
{

	int ret = 0;

	struct bio *bio;

	int nr;

	int contig = 0;

	int this_compressed = bio_flags & EXTENT_BIO_COMPRESSED;

	int old_compressed = prev_bio_flags & EXTENT_BIO_COMPRESSED;

	size_t page_size = min_t(size_t, size, PAGE_CACHE_SIZE);
@@ -2822,12 +2820,9 @@ static int submit_extent_page(int rw, struct extent_io_tree *tree, 
			return 0;

		}

	}

	if (this_compressed)

		nr = BIO_MAX_PAGES;

	else

		nr = bio_get_nr_vecs(bdev);



	bio = btrfs_bio_alloc(bdev, sector, nr, GFP_NOFS | __GFP_HIGH);

	bio = btrfs_bio_alloc(bdev, sector, BIO_MAX_PAGES,

			GFP_NOFS | __GFP_HIGH);

	if (!bio)

		return -ENOMEM;

fs/btrfs/inode.c

+1 −2
Original line number Diff line number Diff line
@@ -7959,8 +7959,7 @@ static void btrfs_end_dio_bio(struct bio *bio) 
static struct bio *btrfs_dio_bio_alloc(struct block_device *bdev,

				       u64 first_sector, gfp_t gfp_flags)

{

	int nr_vecs = bio_get_nr_vecs(bdev);

	return btrfs_bio_alloc(bdev, first_sector, nr_vecs, gfp_flags);

	return btrfs_bio_alloc(bdev, first_sector, BIO_MAX_PAGES, gfp_flags);

}



static inline int btrfs_lookup_and_bind_dio_csum(struct btrfs_root *root,