Skip to content

Commit

Permalink
btrfs: add set_folio_extent_mapped() helper
Browse files Browse the repository at this point in the history
[ Upstream commit dfba9f4 ]

Turn set_page_extent_mapped() into a wrapper around this version.
Saves a call to compound_head() for callers who already have a folio
and removes a couple of users of page->mapping.

Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Stable-dep-of: 86211ee ("btrfs: qgroup: validate btrfs_qgroup_inherit parameter")
Signed-off-by: Sasha Levin <sashal@kernel.org>
  • Loading branch information
Matthew Wilcox (Oracle) authored and gregkh committed Apr 3, 2024
1 parent 6e3fc67 commit 3d44714
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 4 deletions.
12 changes: 8 additions & 4 deletions fs/btrfs/extent_io.c
Expand Up @@ -936,17 +936,21 @@ static int attach_extent_buffer_folio(struct extent_buffer *eb,

int set_page_extent_mapped(struct page *page)
{
struct folio *folio = page_folio(page);
return set_folio_extent_mapped(page_folio(page));
}

int set_folio_extent_mapped(struct folio *folio)
{
struct btrfs_fs_info *fs_info;

ASSERT(page->mapping);
ASSERT(folio->mapping);

if (folio_test_private(folio))
return 0;

fs_info = btrfs_sb(page->mapping->host->i_sb);
fs_info = btrfs_sb(folio->mapping->host->i_sb);

if (btrfs_is_subpage(fs_info, page->mapping))
if (btrfs_is_subpage(fs_info, folio->mapping))
return btrfs_attach_subpage(fs_info, folio, BTRFS_SUBPAGE_DATA);

folio_attach_private(folio, (void *)EXTENT_FOLIO_PRIVATE);
Expand Down
1 change: 1 addition & 0 deletions fs/btrfs/extent_io.h
Expand Up @@ -221,6 +221,7 @@ int btree_write_cache_pages(struct address_space *mapping,
void extent_readahead(struct readahead_control *rac);
int extent_fiemap(struct btrfs_inode *inode, struct fiemap_extent_info *fieinfo,
u64 start, u64 len);
int set_folio_extent_mapped(struct folio *folio);
int set_page_extent_mapped(struct page *page);
void clear_page_extent_mapped(struct page *page);

Expand Down

0 comments on commit 3d44714

Please sign in to comment.