Commit 9f5db280 authored by Josef Bacik's avatar Josef Bacik Committed by David Sterba

btrfs: convert cow_file_range_inline() to take a folio

Now that we want the folio in this function, convert it to take a folio
directly and use that.
Signed-off-by: default avatarJosef Bacik <josef@toxicpanda.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 2cdc1fbb
...@@ -715,7 +715,7 @@ static noinline int __cow_file_range_inline(struct btrfs_inode *inode, u64 offse ...@@ -715,7 +715,7 @@ static noinline int __cow_file_range_inline(struct btrfs_inode *inode, u64 offse
} }
static noinline int cow_file_range_inline(struct btrfs_inode *inode, static noinline int cow_file_range_inline(struct btrfs_inode *inode,
struct page *locked_page, struct folio *locked_folio,
u64 offset, u64 end, u64 offset, u64 end,
size_t compressed_size, size_t compressed_size,
int compress_type, int compress_type,
...@@ -741,10 +741,9 @@ static noinline int cow_file_range_inline(struct btrfs_inode *inode, ...@@ -741,10 +741,9 @@ static noinline int cow_file_range_inline(struct btrfs_inode *inode,
} }
if (ret == 0) if (ret == 0)
locked_page = NULL; locked_folio = NULL;
extent_clear_unlock_delalloc(inode, offset, end, extent_clear_unlock_delalloc(inode, offset, end, locked_folio, &cached,
page_folio(locked_page), &cached,
clear_flags, PAGE_UNLOCK | clear_flags, PAGE_UNLOCK |
PAGE_START_WRITEBACK | PAGE_END_WRITEBACK); PAGE_START_WRITEBACK | PAGE_END_WRITEBACK);
return ret; return ret;
...@@ -1365,8 +1364,9 @@ static noinline int cow_file_range(struct btrfs_inode *inode, ...@@ -1365,8 +1364,9 @@ static noinline int cow_file_range(struct btrfs_inode *inode,
if (!no_inline) { if (!no_inline) {
/* lets try to make an inline extent */ /* lets try to make an inline extent */
ret = cow_file_range_inline(inode, locked_page, start, end, 0, ret = cow_file_range_inline(inode, page_folio(locked_page),
BTRFS_COMPRESS_NONE, NULL, false); start, end, 0, BTRFS_COMPRESS_NONE,
NULL, false);
if (ret <= 0) { if (ret <= 0) {
/* /*
* We succeeded, return 1 so the caller knows we're done * We succeeded, return 1 so the caller knows we're done
......
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