korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-29 23:24:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

btrfs: Convert btrfs_migratepage to migrate_folio

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

Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Acked-by: David Sterba <dsterba@suse.com>
This commit is contained in:
Matthew Wilcox (Oracle) 2022-06-06 10:47:21 -04:00
parent 2ec810d596
commit e7a60a1787
1 changed files with 9 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
fs/btrfs/inode.c
View File

@ -8255,30 +8255,24 @@ static bool btrfs_release_folio(struct folio *folio, gfp_t gfp_flags)
} }
#ifdef CONFIG_MIGRATION #ifdef CONFIG_MIGRATION
static int btrfs_migratepage(struct address_space *mapping, static int btrfs_migrate_folio(struct address_space *mapping,
struct page *newpage, struct page *page, struct folio *dst, struct folio *src,
enum migrate_mode mode) 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) if (ret != MIGRATEPAGE_SUCCESS)
return ret; return ret;
if (page_has_private(page)) if (folio_test_ordered(src)) {
attach_page_private(newpage, detach_page_private(page)); folio_clear_ordered(src);
folio_set_ordered(dst);
if (PageOrdered(page)) {
ClearPageOrdered(page);
SetPageOrdered(newpage);
} }
if (mode != MIGRATE_SYNC_NO_COPY)
migrate_page_copy(newpage, page);
else
migrate_page_states(newpage, page);
return MIGRATEPAGE_SUCCESS; return MIGRATEPAGE_SUCCESS;
} }
#else
#define btrfs_migrate_folio NULL
#endif #endif
static void btrfs_invalidate_folio(struct folio *folio, size_t offset, 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, .direct_IO = noop_direct_IO,
.invalidate_folio = btrfs_invalidate_folio, .invalidate_folio = btrfs_invalidate_folio,
.release_folio = btrfs_release_folio, .release_folio = btrfs_release_folio,
#ifdef CONFIG_MIGRATION .migrate_folio = btrfs_migrate_folio,
.migratepage = btrfs_migratepage,
#endif
.dirty_folio = filemap_dirty_folio, .dirty_folio = filemap_dirty_folio,
.error_remove_page = generic_error_remove_page, .error_remove_page = generic_error_remove_page,
.swap_activate = btrfs_swap_activate, .swap_activate = btrfs_swap_activate,