Merge tag 'for-6.0-rc4-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave...

[linux-2.6-block.git] / fs / btrfs / disk-io.c

diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
index 129711773ae51b2ec4e8907b08b6c831b9208ad4..1af28b066b42a1a54c78951de8a0839b6a545532 100644 (file)
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
@@ -785,28 +785,28 @@ void btrfs_submit_metadata_bio(struct inode *inode, struct bio *bio, int mirror_
 }
 
 #ifdef CONFIG_MIGRATION
-static int btree_migratepage(struct address_space *mapping,
-                       struct page *newpage, struct page *page,
-                       enum migrate_mode mode)
+static int btree_migrate_folio(struct address_space *mapping,
+               struct folio *dst, struct folio *src, enum migrate_mode mode)
 {
        /*
         * we can't safely write a btree page from here,
         * we haven't done the locking hook
         */
-       if (PageDirty(page))
+       if (folio_test_dirty(src))
                return -EAGAIN;
        /*
         * Buffers may be managed in a filesystem specific way.
         * We must have no buffers or drop them.
         */
-       if (page_has_private(page) &&
-           !try_to_release_page(page, GFP_KERNEL))
+       if (folio_get_private(src) &&
+           !filemap_release_folio(src, GFP_KERNEL))
                return -EAGAIN;
-       return migrate_page(mapping, newpage, page, mode);
+       return migrate_folio(mapping, dst, src, mode);
 }
+#else
+#define btree_migrate_folio NULL
 #endif
 
-
 static int btree_writepages(struct address_space *mapping,
                            struct writeback_control *wbc)
 {
@@ -906,10 +906,8 @@ static const struct address_space_operations btree_aops = {
        .writepages     = btree_writepages,
        .release_folio  = btree_release_folio,
        .invalidate_folio = btree_invalidate_folio,
-#ifdef CONFIG_MIGRATION
-       .migratepage    = btree_migratepage,
-#endif
-       .dirty_folio = btree_dirty_folio,
+       .migrate_folio  = btree_migrate_folio,
+       .dirty_folio    = btree_dirty_folio,
 };
 
 struct extent_buffer *btrfs_find_create_tree_block(