btrfs: sink write_flags to __extent_writepage_io
authorDavid Sterba <dsterba@suse.com>
Tue, 29 Oct 2019 17:28:55 +0000 (18:28 +0100)
committerDavid Sterba <dsterba@suse.com>
Mon, 18 Nov 2019 16:51:48 +0000 (17:51 +0100)
__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>
fs/btrfs/extent_io.c

index a2f919087fa11a2d218d8a78295fb11f89305551..ceb3c028894ed454792b3ba8d73958c839e72157 100644 (file)
@@ -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);
@@ -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);
@@ -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));
@@ -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;