aboutsummaryrefslogtreecommitdiffstats
path: root/fs/btrfs/extent_io.c
diff options
context:
space:
mode:
authorKent Overstreet <kent.overstreet@gmail.com>2015-05-19 08:31:01 -0400
committerJens Axboe <axboe@fb.com>2015-08-13 14:32:04 -0400
commitb54ffb73cadcdcff9cc1ae0e11f502407e3e2e4c (patch)
tree8a6d90b3e092e598fefd34718afd2198d8bff2a7 /fs/btrfs/extent_io.c
parent6cf66b4caf9c71f64a5486cadbd71ab58d0d4307 (diff)
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: Steven Whitehouse <swhiteho@redhat.com> Signed-off-by: Kent Overstreet <kent.overstreet@gmail.com> [hch: rebased and wrote a changelog] Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Ming Lin <ming.l@ssi.samsung.com> Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'fs/btrfs/extent_io.c')
-rw-r--r--fs/btrfs/extent_io.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c
index c22f175ed024..68b12bbc709f 100644
--- a/fs/btrfs/extent_io.c
+++ b/fs/btrfs/extent_io.c
@@ -2795,9 +2795,7 @@ static int submit_extent_page(int rw, struct extent_io_tree *tree,
2795{ 2795{
2796 int ret = 0; 2796 int ret = 0;
2797 struct bio *bio; 2797 struct bio *bio;
2798 int nr;
2799 int contig = 0; 2798 int contig = 0;
2800 int this_compressed = bio_flags & EXTENT_BIO_COMPRESSED;
2801 int old_compressed = prev_bio_flags & EXTENT_BIO_COMPRESSED; 2799 int old_compressed = prev_bio_flags & EXTENT_BIO_COMPRESSED;
2802 size_t page_size = min_t(size_t, size, PAGE_CACHE_SIZE); 2800 size_t page_size = min_t(size_t, size, PAGE_CACHE_SIZE);
2803 2801
@@ -2822,12 +2820,9 @@ static int submit_extent_page(int rw, struct extent_io_tree *tree,
2822 return 0; 2820 return 0;
2823 } 2821 }
2824 } 2822 }
2825 if (this_compressed)
2826 nr = BIO_MAX_PAGES;
2827 else
2828 nr = bio_get_nr_vecs(bdev);
2829 2823
2830 bio = btrfs_bio_alloc(bdev, sector, nr, GFP_NOFS | __GFP_HIGH); 2824 bio = btrfs_bio_alloc(bdev, sector, BIO_MAX_PAGES,
2825 GFP_NOFS | __GFP_HIGH);
2831 if (!bio) 2826 if (!bio)
2832 return -ENOMEM; 2827 return -ENOMEM;
2833 2828