Skip to content

Commit

Permalink
btrfs: sink write_flags to __extent_writepage_io
Browse files Browse the repository at this point in the history
__extent_writepage reads write flags from wbc and passes both to
__extent_writepage_io. This makes write_flags redundant and we can
remove it.

Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de>
Reviewed-by: Nikolay Borisov <nborisov@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
  • Loading branch information
kdave committed Nov 18, 2019
1 parent fd0ddbe commit 57e5ffe
Showing 1 changed file with 3 additions and 5 deletions.
8 changes: 3 additions & 5 deletions fs/btrfs/extent_io.c
Original file line number Diff line number Diff line change
Expand Up @@ -3419,7 +3419,7 @@ static noinline_for_stack int __extent_writepage_io(struct inode *inode,
struct extent_page_data *epd,
loff_t i_size,
unsigned long nr_written,
unsigned int write_flags, int *nr_ret)
int *nr_ret)
{
struct extent_io_tree *tree = epd->tree;
u64 start = page_offset(page);
Expand All @@ -3435,6 +3435,7 @@ static noinline_for_stack int __extent_writepage_io(struct inode *inode,
size_t blocksize;
int ret = 0;
int nr = 0;
const unsigned int write_flags = wbc_to_write_flags(wbc);
bool compressed;

ret = btrfs_writepage_cow_fixup(page, start, page_end);
Expand Down Expand Up @@ -3568,11 +3569,8 @@ static int __extent_writepage(struct page *page, struct writeback_control *wbc,
size_t pg_offset = 0;
loff_t i_size = i_size_read(inode);
unsigned long end_index = i_size >> PAGE_SHIFT;
unsigned int write_flags = 0;
unsigned long nr_written = 0;

write_flags = wbc_to_write_flags(wbc);

trace___extent_writepage(page, inode, wbc);

WARN_ON(!PageLocked(page));
Expand Down Expand Up @@ -3610,7 +3608,7 @@ static int __extent_writepage(struct page *page, struct writeback_control *wbc,
}

ret = __extent_writepage_io(inode, page, wbc, epd,
i_size, nr_written, write_flags, &nr);
i_size, nr_written, &nr);
if (ret == 1)
goto done_unlocked;

Expand Down

0 comments on commit 57e5ffe

Please sign in to comment.