btrfs: Convert from set_page_dirty to dirty_folio

Optimise the non-DEBUG case to just call filemap_dirty_folio
directly.  The DEBUG case doesn't actually compile, but convert
it to dirty_folio anyway.

Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Tested-by: Damien Le Moal <damien.lemoal@opensource.wdc.com>
Acked-by: Damien Le Moal <damien.lemoal@opensource.wdc.com>
Tested-by: Mike Marshall <hubcap@omnibond.com> # orangefs
Tested-by: David Howells <dhowells@redhat.com> # afs

diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
index 7e9d3b9c50e3f8f94ade85c3e4c1baebabe2224e..90642cedae784d2f2c66caa6da8b621fb4ed3cb2 100644 (file)
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
@@ -1014,26 +1014,25 @@ static void btree_invalidate_folio(struct folio *folio, size_t offset,
        }
 }
 
-static int btree_set_page_dirty(struct page *page)
-{
 #ifdef DEBUG
-       struct btrfs_fs_info *fs_info = btrfs_sb(page->mapping->host->i_sb);
+static bool btree_dirty_folio(struct address_space *mapping,
+               struct folio *folio)
+{
+       struct btrfs_fs_info *fs_info = btrfs_sb(mapping->host->i_sb);
        struct btrfs_subpage *subpage;
        struct extent_buffer *eb;
        int cur_bit = 0;
-       u64 page_start = page_offset(page);
+       u64 page_start = folio_pos(folio);
 
        if (fs_info->sectorsize == PAGE_SIZE) {
-               BUG_ON(!PagePrivate(page));
-               eb = (struct extent_buffer *)page->private;
+               eb = folio_get_private(folio);
                BUG_ON(!eb);
                BUG_ON(!test_bit(EXTENT_BUFFER_DIRTY, &eb->bflags));
                BUG_ON(!atomic_read(&eb->refs));
                btrfs_assert_tree_write_locked(eb);
-               return __set_page_dirty_nobuffers(page);
+               return filemap_dirty_folio(mapping, folio);
        }
-       ASSERT(PagePrivate(page) && page->private);
-       subpage = (struct btrfs_subpage *)page->private;
+       subpage = folio_get_private(folio);
 
        ASSERT(subpage->dirty_bitmap);
        while (cur_bit < BTRFS_SUBPAGE_BITMAP_SIZE) {
@@ -1059,9 +1058,11 @@ static int btree_set_page_dirty(struct page *page)
 
                cur_bit += (fs_info->nodesize >> fs_info->sectorsize_bits);
        }
-#endif
-       return __set_page_dirty_nobuffers(page);
+       return filemap_dirty_folio(mapping, folio);
 }
+#else
+#define btree_dirty_folio filemap_dirty_folio
+#endif
 
 static const struct address_space_operations btree_aops = {
        .writepages     = btree_writepages,
@@ -1070,7 +1071,7 @@ static const struct address_space_operations btree_aops = {
 #ifdef CONFIG_MIGRATION
        .migratepage    = btree_migratepage,
 #endif
-       .set_page_dirty = btree_set_page_dirty,
+       .dirty_folio = btree_dirty_folio,
 };
 
 struct extent_buffer *btrfs_find_create_tree_block(