The patch titled Subject: mm-swap-convert-deactivate_page-to-folio_deactivate-fix has been added to the -mm mm-unstable branch. Its filename is mm-swap-convert-deactivate_page-to-folio_deactivate-fix.patch This patch will shortly appear at https://git.kernel.org/pub/scm/linux/kernel/git/akpm/25-new.git/tree/patches/mm-swap-convert-deactivate_page-to-folio_deactivate-fix.patch This patch will later appear in the mm-unstable branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/process/submit-checklist.rst when testing your code *** The -mm tree is included into linux-next via the mm-everything branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm and is updated there every 2-3 working days ------------------------------------------------------ From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> Subject: mm-swap-convert-deactivate_page-to-folio_deactivate-fix Date: Fri Dec 23 09:52:24 AM PST 2022 fix left-over comments, per Yu Zhao Cc: Yu Zhao <yuzhao@xxxxxxxxxx> Cc: Matthew Wilcox (Oracle) <willy@xxxxxxxxxxxxx> Cc: SeongJae Park <sj@xxxxxxxxxx> Cc: "Vishal Moola (Oracle)" <vishal.moola@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- --- a/mm/page-writeback.c~mm-swap-convert-deactivate_page-to-folio_deactivate-fix +++ a/mm/page-writeback.c @@ -2846,11 +2846,11 @@ bool folio_mark_dirty(struct folio *foli if (likely(mapping)) { /* - * readahead/lru_deactivate_page could remain + * readahead/folio_deactivate could remain * PG_readahead/PG_reclaim due to race with folio_end_writeback * About readahead, if the folio is written, the flags would be * reset. So no problem. - * About lru_deactivate_page, if the folio is redirtied, + * About folio_deactivate, if the folio is redirtied, * the flag will be reset. So no problem. but if the * folio is used by readahead it will confuse readahead * and make it restart the size rampup process. But it's --- a/mm/vmscan.c~mm-swap-convert-deactivate_page-to-folio_deactivate-fix +++ a/mm/vmscan.c @@ -1920,7 +1920,7 @@ retry: !test_bit(PGDAT_DIRTY, &pgdat->flags))) { /* * Immediately reclaim when written back. - * Similar in principle to deactivate_page() + * Similar in principle to folio_deactivate() * except we already have the folio isolated * and know it's dirty */ _ Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are mm-memfd-add-mfd_noexec_seal-and-mfd_exec-fix.patch mm-memfd-add-mfd_noexec_seal-and-mfd_exec-fix-fix.patch mm-memfd-add-mfd_noexec_seal-and-mfd_exec-fix-3.patch mm-memfd-add-mfd_noexec_seal-and-mfd_exec-fix-3-fix.patch mm-hugetlb-introduce-hugetlb_walk-checkpatch-fixes.patch mm-memcontrol-deprecate-charge-moving-fix.patch mm-swap-convert-deactivate_page-to-folio_deactivate-fix.patch error-injection-remove-ei_etype_none-fix.patch hfsplus-remove-unnecessary-variable-initialization-fix.patch