btrfs: sink argument tree to extent_read_full_page

The tree pointer can be safely read from the page's inode, use it and
drop the redundant argument.

Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Reviewed-by: Nikolay Borisov <nborisov@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
index f859a28255dd9c32490750cca665509ef7e61a63..49daf6c946df6e2aa944c67391e57cbd26ea3d70 100644 (file)
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
@@ -978,9 +978,7 @@ static int btree_writepages(struct address_space *mapping,
 
 static int btree_readpage(struct file *file, struct page *page)
 {
-       struct extent_io_tree *tree;
-       tree = &BTRFS_I(page->mapping->host)->io_tree;
-       return extent_read_full_page(tree, page, btree_get_extent, 0);
+       return extent_read_full_page(page, btree_get_extent, 0);
 }
 
 static int btree_releasepage(struct page *page, gfp_t gfp_flags)

diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c
index 35accc9b8ced5d8c579a9f9408bb74b3aaeb12a0..7e22f7de733ffd211d2a31243cbbd1fd7cfccf04 100644 (file)
--- a/fs/btrfs/extent_io.c
+++ b/fs/btrfs/extent_io.c
@@ -3361,15 +3361,14 @@ static int __extent_read_full_page(struct extent_io_tree *tree,
        return ret;
 }
 
-int extent_read_full_page(struct extent_io_tree *tree, struct page *page,
-                           get_extent_t *get_extent, int mirror_num)
+int extent_read_full_page(struct page *page, get_extent_t *get_extent,
+                         int mirror_num)
 {
        struct bio *bio = NULL;
        unsigned long bio_flags = 0;
+       struct extent_io_tree *tree = &BTRFS_I(page->mapping->host)->io_tree;
        int ret;
 
-       ASSERT(tree == &BTRFS_I(page->mapping->host)->io_tree);
-
        ret = __extent_read_full_page(tree, page, get_extent, &bio, mirror_num,
                                      &bio_flags, 0);
        if (bio)

diff --git a/fs/btrfs/extent_io.h b/fs/btrfs/extent_io.h
index 5d205bbaafdcb184f107ae55ace5f31ea01ccfc6..234622101230f6e7ea544900c6b0ad3b8bd08732 100644 (file)
--- a/fs/btrfs/extent_io.h
+++ b/fs/btrfs/extent_io.h
@@ -189,8 +189,8 @@ typedef struct extent_map *(get_extent_t)(struct btrfs_inode *inode,
 int try_release_extent_mapping(struct page *page, gfp_t mask);
 int try_release_extent_buffer(struct page *page);
 
-int extent_read_full_page(struct extent_io_tree *tree, struct page *page,
-                         get_extent_t *get_extent, int mirror_num);
+int extent_read_full_page(struct page *page, get_extent_t *get_extent,
+                         int mirror_num);
 int extent_write_full_page(struct page *page, struct writeback_control *wbc);
 int extent_write_locked_range(struct inode *inode, u64 start, u64 end,
                              int mode);

diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index 79a2020a805f575ebb60727563d71127557fc371..254f5ea17e40ef819c124bea92f3bc51afec74c2 100644 (file)
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -8268,9 +8268,7 @@ static int btrfs_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,
 
 int btrfs_readpage(struct file *file, struct page *page)
 {
-       struct extent_io_tree *tree;
-       tree = &BTRFS_I(page->mapping->host)->io_tree;
-       return extent_read_full_page(tree, page, btrfs_get_extent, 0);
+       return extent_read_full_page(page, btrfs_get_extent, 0);
 }
 
 static int btrfs_writepage(struct page *page, struct writeback_control *wbc)