All callers pass btrfs_get_extent.

Signed-off-by: David Sterba <[email protected]>
---
 fs/btrfs/extent_io.c | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c
index 1140ce4d321a..a266239716f7 100644
--- a/fs/btrfs/extent_io.c
+++ b/fs/btrfs/extent_io.c
@@ -3120,7 +3120,7 @@ static inline void __do_contiguous_readpages(struct 
extent_io_tree *tree,
 
 static void __extent_readpages(struct extent_io_tree *tree,
                               struct page *pages[],
-                              int nr_pages, get_extent_t *get_extent,
+                              int nr_pages,
                               struct extent_map **em_cached,
                               struct bio **bio, unsigned long *bio_flags,
                               u64 *prev_em_start)
@@ -3142,7 +3142,8 @@ static void __extent_readpages(struct extent_io_tree 
*tree,
                } else {
                        __do_contiguous_readpages(tree, &pages[first_index],
                                                  index - first_index, start,
-                                                 end, get_extent, em_cached,
+                                                 end, btrfs_get_extent,
+                                                 em_cached,
                                                  bio, bio_flags,
                                                  prev_em_start);
                        start = page_start;
@@ -3154,7 +3155,7 @@ static void __extent_readpages(struct extent_io_tree 
*tree,
        if (end)
                __do_contiguous_readpages(tree, &pages[first_index],
                                          index - first_index, start,
-                                         end, get_extent, em_cached, bio,
+                                         end, btrfs_get_extent, em_cached, bio,
                                          bio_flags, prev_em_start);
 }
 
@@ -4169,13 +4170,13 @@ int extent_readpages(struct extent_io_tree *tree,
                pagepool[nr++] = page;
                if (nr < ARRAY_SIZE(pagepool))
                        continue;
-               __extent_readpages(tree, pagepool, nr, btrfs_get_extent,
-                               &em_cached, &bio, &bio_flags, &prev_em_start);
+               __extent_readpages(tree, pagepool, nr, &em_cached, &bio,
+                               &bio_flags, &prev_em_start);
                nr = 0;
        }
        if (nr)
-               __extent_readpages(tree, pagepool, nr, btrfs_get_extent,
-                               &em_cached, &bio, &bio_flags, &prev_em_start);
+               __extent_readpages(tree, pagepool, nr, &em_cached, &bio,
+                               &bio_flags, &prev_em_start);
 
        if (em_cached)
                free_extent_map(em_cached);
-- 
2.14.3

--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to