|
@@ -4133,8 +4133,7 @@ int extent_writepages(struct extent_io_tree *tree,
|
|
|
|
|
|
int extent_readpages(struct extent_io_tree *tree,
|
|
int extent_readpages(struct extent_io_tree *tree,
|
|
struct address_space *mapping,
|
|
struct address_space *mapping,
|
|
- struct list_head *pages, unsigned nr_pages,
|
|
|
|
- get_extent_t get_extent)
|
|
|
|
|
|
+ struct list_head *pages, unsigned nr_pages)
|
|
{
|
|
{
|
|
struct bio *bio = NULL;
|
|
struct bio *bio = NULL;
|
|
unsigned page_idx;
|
|
unsigned page_idx;
|
|
@@ -4160,13 +4159,13 @@ int extent_readpages(struct extent_io_tree *tree,
|
|
pagepool[nr++] = page;
|
|
pagepool[nr++] = page;
|
|
if (nr < ARRAY_SIZE(pagepool))
|
|
if (nr < ARRAY_SIZE(pagepool))
|
|
continue;
|
|
continue;
|
|
- __extent_readpages(tree, pagepool, nr, get_extent, &em_cached,
|
|
|
|
- &bio, &bio_flags, &prev_em_start);
|
|
|
|
|
|
+ __extent_readpages(tree, pagepool, nr, btrfs_get_extent,
|
|
|
|
+ &em_cached, &bio, &bio_flags, &prev_em_start);
|
|
nr = 0;
|
|
nr = 0;
|
|
}
|
|
}
|
|
if (nr)
|
|
if (nr)
|
|
- __extent_readpages(tree, pagepool, nr, get_extent, &em_cached,
|
|
|
|
- &bio, &bio_flags, &prev_em_start);
|
|
|
|
|
|
+ __extent_readpages(tree, pagepool, nr, btrfs_get_extent,
|
|
|
|
+ &em_cached, &bio, &bio_flags, &prev_em_start);
|
|
|
|
|
|
if (em_cached)
|
|
if (em_cached)
|
|
free_extent_map(em_cached);
|
|
free_extent_map(em_cached);
|