mm-stop-passing-a-writeback_control-structure-to-swap_writeout.patch removed from -mm tree
The quilt patch titled
Subject: mm: stop passing a writeback_control structure to swap_writeout
has been removed from the -mm tree. Its filename was
mm-stop-passing-a-writeback_control-structure-to-swap_writeout.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: stop passing a writeback_control structure to swap_writeout
Date: Tue, 10 Jun 2025 07:49:41 +0200
swap_writeout only needs the swap_iocb cookie from the writeback_control structure, so pass it explicitly.
Signed-off-by Christoph Hellwig <[email protected]>
Cc Baolin Wang <[email protected]>
Cc Chengming Zhou <[email protected]>
Cc Hugh Dickins <[email protected]>
Cc Johannes Weiner <[email protected]>
Cc Matthew Wilcox (Oracle) <[email protected]>
Cc Nhat Pham <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
---
include/linux/writeback.h | 7 ------- mm/page_io.c | 4 ++-- mm/shmem.c | 10 +--------- mm/swap.h | 7 +++++-- mm/vmscan.c | 10 +--------- 5 files changed, 9 insertions(+), 29 deletions(-)
include/linux/writeback.h renamed from include/linux/writeback.h~mm-stop-passing-a-writeback_control-structure-to-swap_writeout +0 -7
@@ -72,13 +72,6 @@ struct writeback_control {*/ unsigned no_cgroup_owner:1; -/* To enable batching of swap writes to non-block-device backends, -* "plug" can be set point to a 'struct swap_iocb *'. When all swap -* writes have been submitted, if with swap_iocb is not NULL, -* swap_write_unplug() should be called. -*/ -struct swap_iocb **swap_plug; -/* internal fields used by the ->writepages implementation: */ struct folio_batch fbatch;pgoff_t index;
mm/page_io.c renamed from mm/page_io.c~mm-stop-passing-a-writeback_control-structure-to-swap_writeout +2 -2
@@ -237,7 +237,7 @@ static void swap_zeromap_folio_clear(str* We may have stale swap cache pages in memory: notice * them here and get rid of the unnecessary final write. */ -int swap_writeout (struct folio *folio,struct writeback_control *wbc) +int swap_writeout (struct folio *folio,struct swap_iocb **swap_plug) {int ret =0 ;
@@ -281,7 +281,7 @@ int swap_writeout(struct folio *folio, sreturn AOP_WRITEPAGE_ACTIVATE ; } -__swap_writepage (folio, wbc->swap_plug); +__swap_writepage (folio, swap_plug);return 0 ; out_unlock:folio_unlock (folio);
mm/shmem.c renamed from mm/shmem.c~mm-stop-passing-a-writeback_control-structure-to-swap_writeout +1 -9
@@ -1635,21 +1635,13 @@ try_split:list_add (&info->swaplist, &shmem_swaplist);if (!folio_alloc_swap (folio, __GFP_HIGH | __GFP_NOMEMALLOC | __GFP_NOWARN)) { -struct writeback_control wbc = { - .sync_mode =WB_SYNC_NONE , - .nr_to_write =SWAP_CLUSTER_MAX , - .range_start =0 , - .range_end =LLONG_MAX , - .for_reclaim =1 , - .swap_plug = plug, - };shmem_recalc_inode (inode,0 , nr_pages);swap_shmem_alloc (folio->swap, nr_pages);shmem_delete_from_page_cache (folio,swp_to_radix_entry (folio->swap));mutex_unlock (&shmem_swaplist_mutex);BUG_ON (folio_mapped (folio)); -return swap_writeout (folio, &wbc); +return swap_writeout (folio, plug); }if (!info->swapped)list_del_init (&info->swaplist);
mm/swap.h renamed from mm/swap.h~mm-stop-passing-a-writeback_control-structure-to-swap_writeout +5 -2
@@ -3,6 +3,8 @@#define _MM_SWAP_Hstruct mempolicy ; +struct swap_iocb ; +extern int page_cluster;#ifdef CONFIG_SWAP
@@ -20,7 +22,7 @@ static inline void swap_read_unplug(stru__swap_read_unplug (plug); }void swap_write_unplug (struct swap_iocb *sio); -int swap_writeout (struct folio *folio,struct writeback_control *wbc); +int swap_writeout (struct folio *folio,struct swap_iocb **swap_plug);void __swap_writepage (struct folio *folio,struct swap_iocb **swap_plug);/* linux/mm/swap_state.c */
@@ -160,7 +162,8 @@ static inline struct folio *swapin_readareturn NULL ; } -static inline int swap_writeout (struct folio *f,struct writeback_control *wbc) +static inline int swap_writeout (struct folio *folio, +struct swap_iocb **swap_plug) {return 0 ; }
mm/vmscan.c renamed from mm/vmscan.c~mm-stop-passing-a-writeback_control-structure-to-swap_writeout +1 -9
@@ -655,14 +655,6 @@ typedef enum {static pageout_t writeout (struct folio *folio,struct address_space *mapping,struct swap_iocb **plug,struct list_head *folio_list) { -struct writeback_control wbc = { - .sync_mode =WB_SYNC_NONE , - .nr_to_write =SWAP_CLUSTER_MAX , - .range_start =0 , - .range_end =LLONG_MAX , - .for_reclaim =1 , - .swap_plug = plug, - };int res;folio_set_reclaim (folio);
@@ -675,7 +667,7 @@ static pageout_t writeout(struct folio *if (shmem_mapping (mapping)) res =shmem_writeout (folio, plug, folio_list);else - res =swap_writeout (folio, &wbc); + res =swap_writeout (folio, plug);if (res <0 )handle_write_error (mapping, folio, res);
_
Patches currently in -mm which might be from [email protected] are