btrfs: add set_folio_extent_mapped() helper

[ Upstream commit dfba9f47730604a46c284f6099a11c5686b6289d ]

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: 86211eea8ae1 ("btrfs: qgroup: validate btrfs_qgroup_inherit parameter")
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c
index 7761d7d93ba989d36c552a1209b1d83f9e7fd61a..8b88cd08ab0535016ebf8783748f409ac006ded8 100644 (file)
--- a/fs/btrfs/extent_io.c
+++ b/fs/btrfs/extent_io.c
@@ -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);

diff --git a/fs/btrfs/extent_io.h b/fs/btrfs/extent_io.h
index 46050500529bff3720c3f117ca593646abaadc65..2c9d6570b0a388b5e69fd2341f8536fda9f8b174 100644 (file)
--- a/fs/btrfs/extent_io.h
+++ b/fs/btrfs/extent_io.h
@@ -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);