btrfs: Remove extent_page_data argument from writepage_delalloc
authorNikolay Borisov <nborisov@suse.com>
Thu, 8 Nov 2018 08:18:07 +0000 (10:18 +0200)
committerDavid Sterba <dsterba@suse.com>
Mon, 17 Dec 2018 13:51:32 +0000 (14:51 +0100)
The only remaining use of the 'epd' argument in writepage_delalloc is
to reference the extent_io_tree which was set in extent_writepages. Since
it is guaranteed that page->mapping of any page passed to
writepage_delalloc (and __extent_writepage as the sole caller) to be
equal to that passed in extent_writepages we can directly get the
io_tree via the already passed inode (which is also taken from
page->mapping->host). No functional changes.

Signed-off-by: Nikolay Borisov <nborisov@suse.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
fs/btrfs/extent_io.c

index 2ccc8d93d93e71738ba16d0319a8896a1b13ef1b..247e38ef49a6571781fb24c23f3318158f8f5118 100644 (file)
@@ -3201,12 +3201,10 @@ static void update_nr_written(struct writeback_control *wbc,
  * This returns < 0 if there were errors (page still locked)
  */
 static noinline_for_stack int writepage_delalloc(struct inode *inode,
-                             struct page *page, struct writeback_control *wbc,
-                             struct extent_page_data *epd,
-                             u64 delalloc_start,
-                             unsigned long *nr_written)
+               struct page *page, struct writeback_control *wbc,
+               u64 delalloc_start, unsigned long *nr_written)
 {
-       struct extent_io_tree *tree = epd->tree;
+       struct extent_io_tree *tree = &BTRFS_I(inode)->io_tree;
        u64 page_end = delalloc_start + PAGE_SIZE - 1;
        u64 nr_delalloc;
        u64 delalloc_to_write = 0;
@@ -3470,8 +3468,7 @@ static int __extent_writepage(struct page *page, struct writeback_control *wbc,
        set_page_extent_mapped(page);
 
        if (!epd->extent_locked) {
-               ret = writepage_delalloc(inode, page, wbc, epd, start,
-                                        &nr_written);
+               ret = writepage_delalloc(inode, page, wbc, start, &nr_written);
                if (ret == 1)
                        goto done_unlocked;
                if (ret)