Re: [PATCH 19/21] iomap: Convert iomap_migrate_page to use folios

Matthew Wilcox
2021-11-06T03:46:16Z

On Mon, Nov 01, 2021 at 08:39:27PM +0000, Matthew Wilcox (Oracle) wrote:
> +++ b/fs/iomap/buffered-io.c
> @@ -493,19 +493,21 @@ int
> iomap_migrate_page(struct address_space *mapping, struct page *newpage,
> struct page *page, enum migrate_mode mode)
> {
> + struct folio *folio = page_folio(page);
> + struct folio *newfolio = page_folio(newpage);

Re-reviewing this patch, and I don't like the naming. How about:

struct folio *src = page_folio(page);
struct folio *dest = page_folio(newpage);

... eventually flowing that renaming throughout the migration
implementations.

> int ret;
>
> - ret = migrate_page_move_mapping(mapping, newpage, page, 0);
> + ret = folio_migrate_mapping(mapping, newfolio, folio, 0);
> if (ret != MIGRATEPAGE_SUCCESS)
> return ret;
>
> - if (page_has_private(page))
> - attach_page_private(newpage, detach_page_private(page));
> + if (folio_test_private(folio))
> + folio_attach_private(newfolio, folio_detach_private(folio));
>
> if (mode != MIGRATE_SYNC_NO_COPY)
> - migrate_page_copy(newpage, page);
> + folio_migrate_copy(newfolio, folio);
> else
> - migrate_page_states(newpage, page);
> + folio_migrate_flags(newfolio, folio);
> return MIGRATEPAGE_SUCCESS;
> }
> EXPORT_SYMBOL_GPL(iomap_migrate_page);
> --
> 2.33.0
>