Commit 01e11841 authored by Josef Bacik's avatar Josef Bacik Committed by David Sterba

btrfs: convert extent_write_locked_range() to take a folio

This mostly uses folios, convert it to take a folio instead and update
the callers to pass in the folio.
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 a67f5405
...@@ -2274,7 +2274,7 @@ static int extent_write_cache_pages(struct address_space *mapping, ...@@ -2274,7 +2274,7 @@ static int extent_write_cache_pages(struct address_space *mapping,
* already been ran (aka, ordered extent inserted) and all pages are still * already been ran (aka, ordered extent inserted) and all pages are still
* locked. * locked.
*/ */
void extent_write_locked_range(struct inode *inode, const struct page *locked_page, void extent_write_locked_range(struct inode *inode, const struct folio *locked_folio,
u64 start, u64 end, struct writeback_control *wbc, u64 start, u64 end, struct writeback_control *wbc,
bool pages_dirty) bool pages_dirty)
{ {
...@@ -2316,7 +2316,7 @@ void extent_write_locked_range(struct inode *inode, const struct page *locked_pa ...@@ -2316,7 +2316,7 @@ void extent_write_locked_range(struct inode *inode, const struct page *locked_pa
} }
ASSERT(folio_test_locked(folio)); ASSERT(folio_test_locked(folio));
if (pages_dirty && &folio->page != locked_page) if (pages_dirty && folio != locked_folio)
ASSERT(folio_test_dirty(folio)); ASSERT(folio_test_dirty(folio));
ret = __extent_writepage_io(BTRFS_I(inode), folio, cur, cur_len, ret = __extent_writepage_io(BTRFS_I(inode), folio, cur, cur_len,
......
...@@ -240,7 +240,7 @@ bool try_release_extent_mapping(struct page *page, gfp_t mask); ...@@ -240,7 +240,7 @@ bool try_release_extent_mapping(struct page *page, gfp_t mask);
int try_release_extent_buffer(struct page *page); int try_release_extent_buffer(struct page *page);
int btrfs_read_folio(struct file *file, struct folio *folio); int btrfs_read_folio(struct file *file, struct folio *folio);
void extent_write_locked_range(struct inode *inode, const struct page *locked_page, void extent_write_locked_range(struct inode *inode, const struct folio *locked_folio,
u64 start, u64 end, struct writeback_control *wbc, u64 start, u64 end, struct writeback_control *wbc,
bool pages_dirty); bool pages_dirty);
int btrfs_writepages(struct address_space *mapping, struct writeback_control *wbc); int btrfs_writepages(struct address_space *mapping, struct writeback_control *wbc);
......
...@@ -1758,7 +1758,8 @@ static noinline int run_delalloc_cow(struct btrfs_inode *inode, ...@@ -1758,7 +1758,8 @@ static noinline int run_delalloc_cow(struct btrfs_inode *inode,
true, false); true, false);
if (ret) if (ret)
return ret; return ret;
extent_write_locked_range(&inode->vfs_inode, locked_page, start, extent_write_locked_range(&inode->vfs_inode,
page_folio(locked_page), start,
done_offset, wbc, pages_dirty); done_offset, wbc, pages_dirty);
start = done_offset + 1; start = done_offset + 1;
} }
......
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