GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-05 22:28:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

btrfs: sink write_flags to __extent_writepage_io

Browse source 
__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>
This commit is contained in:
David Sterba 2019-10-29 18:28:55 +01:00
parent fd0ddbe250
commit 57e5ffeb87
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
fs/btrfs/extent_io.c
View file

@ -3419,7 +3419,7 @@ static noinline_for_stack int __extent_writepage_io(struct inode *inode,
struct extent_page_data *epd, struct extent_page_data *epd,
loff_t i_size, loff_t i_size,
unsigned long nr_written, unsigned long nr_written,
unsigned int write_flags, int *nr_ret) int *nr_ret)
{ {
struct extent_io_tree *tree = epd->tree; struct extent_io_tree *tree = epd->tree;
u64 start = page_offset(page); u64 start = page_offset(page);
@ -3435,6 +3435,7 @@ static noinline_for_stack int __extent_writepage_io(struct inode *inode,
size_t blocksize; size_t blocksize;
int ret = 0; int ret = 0;
int nr = 0; int nr = 0;
const unsigned int write_flags = wbc_to_write_flags(wbc);
bool compressed; bool compressed;
ret = btrfs_writepage_cow_fixup(page, start, page_end); ret = btrfs_writepage_cow_fixup(page, start, page_end);
@ -3568,11 +3569,8 @@ static int __extent_writepage(struct page *page, struct writeback_control *wbc,
size_t pg_offset = 0; size_t pg_offset = 0;
loff_t i_size = i_size_read(inode); loff_t i_size = i_size_read(inode);
unsigned long end_index = i_size >> PAGE_SHIFT; unsigned long end_index = i_size >> PAGE_SHIFT;
unsigned int write_flags = 0;
unsigned long nr_written = 0; unsigned long nr_written = 0;
write_flags = wbc_to_write_flags(wbc);
trace___extent_writepage(page, inode, wbc); trace___extent_writepage(page, inode, wbc);
WARN_ON(!PageLocked(page)); WARN_ON(!PageLocked(page));
@ -3610,7 +3608,7 @@ static int __extent_writepage(struct page *page, struct writeback_control *wbc,
} }
ret = __extent_writepage_io(inode, page, wbc, epd, ret = __extent_writepage_io(inode, page, wbc, epd,
i_size, nr_written, write_flags, &nr); i_size, nr_written, &nr);
if (ret == 1) if (ret == 1)
goto done_unlocked; goto done_unlocked;