|
@@ -3090,7 +3090,6 @@ out:
|
|
|
static inline void __do_contiguous_readpages(struct extent_io_tree *tree,
|
|
|
struct page *pages[], int nr_pages,
|
|
|
u64 start, u64 end,
|
|
|
- get_extent_t *get_extent,
|
|
|
struct extent_map **em_cached,
|
|
|
struct bio **bio,
|
|
|
unsigned long *bio_flags,
|
|
@@ -3113,8 +3112,8 @@ static inline void __do_contiguous_readpages(struct extent_io_tree *tree,
|
|
|
}
|
|
|
|
|
|
for (index = 0; index < nr_pages; index++) {
|
|
|
- __do_readpage(tree, pages[index], get_extent, em_cached, bio,
|
|
|
- 0, bio_flags, 0, prev_em_start);
|
|
|
+ __do_readpage(tree, pages[index], btrfs_get_extent, em_cached,
|
|
|
+ bio, 0, bio_flags, 0, prev_em_start);
|
|
|
put_page(pages[index]);
|
|
|
}
|
|
|
}
|
|
@@ -3143,8 +3142,7 @@ static void __extent_readpages(struct extent_io_tree *tree,
|
|
|
} else {
|
|
|
__do_contiguous_readpages(tree, &pages[first_index],
|
|
|
index - first_index, start,
|
|
|
- end, btrfs_get_extent,
|
|
|
- em_cached,
|
|
|
+ end, em_cached,
|
|
|
bio, bio_flags,
|
|
|
prev_em_start);
|
|
|
start = page_start;
|
|
@@ -3156,7 +3154,7 @@ static void __extent_readpages(struct extent_io_tree *tree,
|
|
|
if (end)
|
|
|
__do_contiguous_readpages(tree, &pages[first_index],
|
|
|
index - first_index, start,
|
|
|
- end, btrfs_get_extent, em_cached, bio,
|
|
|
+ end, em_cached, bio,
|
|
|
bio_flags, prev_em_start);
|
|
|
}
|
|
|
|