btrfs: sink write flags to cow_file_range_async

In commit "Btrfs: use REQ_CGROUP_PUNT for worker thread submitted bios",
cow_file_range_async gained wbc as a parameter and this makes passing
write flags redundant. Set it inside the function and remove the
parameter.

Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de>
Reviewed-by: Nikolay Borisov <nborisov@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index 4c074f4..5b48830 100644 (file)
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -1214,8 +1214,7 @@ static int cow_file_range_async(struct inode *inode,
                                struct writeback_control *wbc,
                                struct page *locked_page,
                                u64 start, u64 end, int *page_started,
-                               unsigned long *nr_written,
-                               unsigned int write_flags)
+                               unsigned long *nr_written)
 {
        struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);
        struct cgroup_subsys_state *blkcg_css = wbc_blkcg_css(wbc);
@@ -1227,6 +1226,7 @@ static int cow_file_range_async(struct inode *inode,
        int i;
        bool should_compress;
        unsigned nofs_flag;
+       const unsigned int write_flags = wbc_to_write_flags(wbc);
 
        unlock_extent(&BTRFS_I(inode)->io_tree, start, end);
 
@@ -1737,7 +1737,6 @@ int btrfs_run_delalloc_range(struct inode *inode, struct page *locked_page,
 {
        int ret;
        int force_cow = need_force_cow(inode, start, end);
-       unsigned int write_flags = wbc_to_write_flags(wbc);
 
        if (BTRFS_I(inode)->flags & BTRFS_INODE_NODATACOW && !force_cow) {
                ret = run_delalloc_nocow(inode, locked_page, start, end,
@@ -1753,8 +1752,7 @@ int btrfs_run_delalloc_range(struct inode *inode, struct page *locked_page,
                set_bit(BTRFS_INODE_HAS_ASYNC_EXTENT,
                        &BTRFS_I(inode)->runtime_flags);
                ret = cow_file_range_async(inode, wbc, locked_page, start, end,
-                                          page_started, nr_written,
-                                          write_flags);
+                                          page_started, nr_written);
        }
        if (ret)
                btrfs_cleanup_ordered_extents(inode, locked_page, start,