提交 b6660e80 编写于 作者: D David Sterba

btrfs: sink arugment tree to contiguous_readpages

The tree pointer can be safely read from the inode, use it and drop the
redundant argument.
Reviewed-by: NJohannes Thumshirn <johannes.thumshirn@wdc.com>
Reviewed-by: NNikolay Borisov <nborisov@suse.com>
Signed-off-by: NDavid Sterba <dsterba@suse.com>
上级 0d44fea7
...@@ -3318,8 +3318,7 @@ static int __do_readpage(struct extent_io_tree *tree, ...@@ -3318,8 +3318,7 @@ static int __do_readpage(struct extent_io_tree *tree,
return ret; return ret;
} }
static inline void contiguous_readpages(struct extent_io_tree *tree, static inline void contiguous_readpages(struct page *pages[], int nr_pages,
struct page *pages[], int nr_pages,
u64 start, u64 end, u64 start, u64 end,
struct extent_map **em_cached, struct extent_map **em_cached,
struct bio **bio, struct bio **bio,
...@@ -3327,10 +3326,9 @@ static inline void contiguous_readpages(struct extent_io_tree *tree, ...@@ -3327,10 +3326,9 @@ static inline void contiguous_readpages(struct extent_io_tree *tree,
u64 *prev_em_start) u64 *prev_em_start)
{ {
struct btrfs_inode *inode = BTRFS_I(pages[0]->mapping->host); struct btrfs_inode *inode = BTRFS_I(pages[0]->mapping->host);
struct extent_io_tree *tree = &inode->io_tree;
int index; int index;
ASSERT(tree == &inode->io_tree);
btrfs_lock_and_flush_ordered_range(inode, start, end, NULL); btrfs_lock_and_flush_ordered_range(inode, start, end, NULL);
for (index = 0; index < nr_pages; index++) { for (index = 0; index < nr_pages; index++) {
...@@ -4328,7 +4326,6 @@ int extent_readpages(struct address_space *mapping, struct list_head *pages, ...@@ -4328,7 +4326,6 @@ int extent_readpages(struct address_space *mapping, struct list_head *pages,
unsigned long bio_flags = 0; unsigned long bio_flags = 0;
struct page *pagepool[16]; struct page *pagepool[16];
struct extent_map *em_cached = NULL; struct extent_map *em_cached = NULL;
struct extent_io_tree *tree = &BTRFS_I(mapping->host)->io_tree;
int nr = 0; int nr = 0;
u64 prev_em_start = (u64)-1; u64 prev_em_start = (u64)-1;
...@@ -4355,7 +4352,7 @@ int extent_readpages(struct address_space *mapping, struct list_head *pages, ...@@ -4355,7 +4352,7 @@ int extent_readpages(struct address_space *mapping, struct list_head *pages,
ASSERT(contig_start + nr * PAGE_SIZE - 1 == contig_end); ASSERT(contig_start + nr * PAGE_SIZE - 1 == contig_end);
contiguous_readpages(tree, pagepool, nr, contig_start, contiguous_readpages(pagepool, nr, contig_start,
contig_end, &em_cached, &bio, &bio_flags, contig_end, &em_cached, &bio, &bio_flags,
&prev_em_start); &prev_em_start);
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册