diff options
| author | David Sterba <dsterba@suse.com> | 2017-06-23 04:09:57 +0200 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2018-01-22 16:08:13 +0100 |
| commit | e4d17ef50719dc38ada5b4166cb670e0651ee4de (patch) | |
| tree | 12b07aadd7ff78333959f0511ab282ebcf431eb5 /fs/btrfs/extent_io.c | |
| parent | 0932584b66e97aea91eb8c0b610e1d1083951b32 (diff) | |
| download | linux-stable-e4d17ef50719dc38ada5b4166cb670e0651ee4de.tar.gz linux-stable-e4d17ef50719dc38ada5b4166cb670e0651ee4de.tar.bz2 linux-stable-e4d17ef50719dc38ada5b4166cb670e0651ee4de.zip | |
btrfs: sink get_extent parameter to __extent_readpages
All callers pass btrfs_get_extent.
Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'fs/btrfs/extent_io.c')
| -rw-r--r-- | fs/btrfs/extent_io.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c index f86a6aae545a..4e7c5d572667 100644 --- a/fs/btrfs/extent_io.c +++ b/fs/btrfs/extent_io.c @@ -3121,7 +3121,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) @@ -3143,7 +3143,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; @@ -3155,7 +3156,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); } @@ -4159,13 +4160,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); |