mm-merge-writeout-into-pageout.patch removed from -mm tree
The quilt patch titled
Subject: mm: merge writeout into pageout
has been removed from the -mm tree. Its filename was
mm-merge-writeout-into-pageout.patch
This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: Christoph Hellwig <[email protected]>
Subject: mm: merge writeout into pageout
Date: Mon, 1 Jun 2026 13:34:28 +0200
writeout is only called from pageout, and a straight flow at the end, so merge the two functions.
Signed-off-by Christoph Hellwig <[email protected]>
Reviewed-by Baoquan He <[email protected]>
Reviewed-by Nhat Pham <[email protected]>
Cc Chris Li <[email protected]>
Cc Kairui Song <[email protected]>
Cc Kemeng Shi <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
---
mm/vmscan.c | 63 +++++++++++++++++++++++--------------------------- 1 file changed, 29 insertions(+), 34 deletions(-)
mm/vmscan.c renamed from mm/vmscan.c~mm-merge-writeout-into-pageout +29 -34
@@ -612,45 +612,14 @@ typedef enum {PAGE_CLEAN , } pageout_t; -static pageout_t writeout (struct folio *folio,struct address_space *mapping, -struct swap_iocb **plug,struct list_head *folio_list) -{ -int res; - -folio_set_reclaim (folio); - -/* -* The large shmem folio can be split if CONFIG_THP_SWAP is not enabled -* or we failed to allocate contiguous swap entries, in which case -* the split out folios get added back to folio_list. -*/ -if (shmem_mapping (mapping)) - res =shmem_writeout (folio, plug, folio_list); -else - res =swap_writeout (folio, plug); - -if (res <0 ) -handle_write_error (mapping, folio, res); -if (res ==AOP_WRITEPAGE_ACTIVATE ) { -folio_clear_reclaim (folio); -return PAGE_ACTIVATE ; - } - -/* synchronous write? */ -if (!folio_test_writeback (folio)) -folio_clear_reclaim (folio); - -trace_mm_vmscan_write_folio (folio); -node_stat_add_folio (folio,NR_VMSCAN_WRITE ); -return PAGE_SUCCESS ; -} -/* * pageout is called by shrink_folio_list() for each dirty folio. */ static pageout_t pageout (struct folio *folio,struct address_space *mapping,struct swap_iocb **plug,struct list_head *folio_list) { +int res; +/* * We no longer attempt to writeback filesystem folios here, other * than tmpfs/shmem. That's taken care of in page-writeback.
@@ -674,7 +643,33 @@ static pageout_t pageout(struct folio *freturn PAGE_ACTIVATE ;if (!folio_clear_dirty_for_io (folio))return PAGE_CLEAN ; -return writeout (folio, mapping, plug, folio_list); + +folio_set_reclaim (folio); + +/* +* The large shmem folio can be split if CONFIG_THP_SWAP is not enabled +* or we failed to allocate contiguous swap entries, in which case +* the split out folios get added back to folio_list. +*/ +if (shmem_mapping (mapping)) + res =shmem_writeout (folio, plug, folio_list); +else + res =swap_writeout (folio, plug); + +if (res <0 ) +handle_write_error (mapping, folio, res); +if (res ==AOP_WRITEPAGE_ACTIVATE ) { +folio_clear_reclaim (folio); +return PAGE_ACTIVATE ; + } + +/* synchronous write? */ +if (!folio_test_writeback (folio)) +folio_clear_reclaim (folio); + +trace_mm_vmscan_write_folio (folio); +node_stat_add_folio (folio,NR_VMSCAN_WRITE ); +return PAGE_SUCCESS ; }/*
_
Patches currently in -mm which might be from [email protected] are