Commit e7a60a17 authored by Matthew Wilcox (Oracle)'s avatar Matthew Wilcox (Oracle)
Browse files

btrfs: Convert btrfs_migratepage to migrate_folio 



Use filemap_migrate_folio() to do the bulk of the work, and then copy
the ordered flag across if needed.

Signed-off-by: default avatarMatthew Wilcox (Oracle) <willy@infradead.org>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Acked-by: default avatarDavid Sterba <dsterba@suse.com>
parent 2ec810d5

fs/btrfs/inode.c

+9 −17
Original line number Diff line number Diff line
@@ -8255,30 +8255,24 @@ static bool btrfs_release_folio(struct folio *folio, gfp_t gfp_flags) 
}



#ifdef CONFIG_MIGRATION

static int btrfs_migratepage(struct address_space *mapping,

			     struct page *newpage, struct page *page,

static int btrfs_migrate_folio(struct address_space *mapping,

			     struct folio *dst, struct folio *src,

			     enum migrate_mode mode)

{

	int ret;

	int ret = filemap_migrate_folio(mapping, dst, src, mode);



	ret = migrate_page_move_mapping(mapping, newpage, page, 0);

	if (ret != MIGRATEPAGE_SUCCESS)

		return ret;



	if (page_has_private(page))

		attach_page_private(newpage, detach_page_private(page));



	if (PageOrdered(page)) {

		ClearPageOrdered(page);

		SetPageOrdered(newpage);

	if (folio_test_ordered(src)) {

		folio_clear_ordered(src);

		folio_set_ordered(dst);

	}



	if (mode != MIGRATE_SYNC_NO_COPY)

		migrate_page_copy(newpage, page);

	else

		migrate_page_states(newpage, page);

	return MIGRATEPAGE_SUCCESS;

}

#else

#define btrfs_migrate_folio NULL

#endif



static void btrfs_invalidate_folio(struct folio *folio, size_t offset,
@@ -11422,9 +11416,7 @@ static const struct address_space_operations btrfs_aops = { 
	.direct_IO	= noop_direct_IO,

	.invalidate_folio = btrfs_invalidate_folio,

	.release_folio	= btrfs_release_folio,

#ifdef CONFIG_MIGRATION

	.migratepage	= btrfs_migratepage,

#endif

	.migrate_folio	= btrfs_migrate_folio,

	.dirty_folio	= filemap_dirty_folio,

	.error_remove_page = generic_error_remove_page,

	.swap_activate	= btrfs_swap_activate,