Commit 8cc0237a authored by Nikolay Borisov's avatar Nikolay Borisov Committed by David Sterba

btrfs: Remove extent_page_data argument from writepage_delalloc

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: default avatarNikolay Borisov <nborisov@suse.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 7789a55a
...@@ -3201,12 +3201,10 @@ static void update_nr_written(struct writeback_control *wbc, ...@@ -3201,12 +3201,10 @@ static void update_nr_written(struct writeback_control *wbc,
* This returns < 0 if there were errors (page still locked) * This returns < 0 if there were errors (page still locked)
*/ */
static noinline_for_stack int writepage_delalloc(struct inode *inode, static noinline_for_stack int writepage_delalloc(struct inode *inode,
struct page *page, struct writeback_control *wbc, struct page *page, struct writeback_control *wbc,
struct extent_page_data *epd, u64 delalloc_start, unsigned long *nr_written)
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 page_end = delalloc_start + PAGE_SIZE - 1;
u64 nr_delalloc; u64 nr_delalloc;
u64 delalloc_to_write = 0; u64 delalloc_to_write = 0;
...@@ -3470,8 +3468,7 @@ static int __extent_writepage(struct page *page, struct writeback_control *wbc, ...@@ -3470,8 +3468,7 @@ static int __extent_writepage(struct page *page, struct writeback_control *wbc,
set_page_extent_mapped(page); set_page_extent_mapped(page);
if (!epd->extent_locked) { if (!epd->extent_locked) {
ret = writepage_delalloc(inode, page, wbc, epd, start, ret = writepage_delalloc(inode, page, wbc, start, &nr_written);
&nr_written);
if (ret == 1) if (ret == 1)
goto done_unlocked; goto done_unlocked;
if (ret) if (ret)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment