mm-factor-out-a-swap_writepage_bdev-helper.patch removed from -mm tree
The quilt patch titled
Subject: mm: factor out a swap_writepage_bdev helper
has been removed from the -mm tree. Its filename was
mm-factor-out-a-swap_writepage_bdev-helper.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: factor out a swap_writepage_bdev helper
Date: Wed, 25 Jan 2023 14:34:35 +0100
Split the block device case from swap_readpage into a separate helper, following the abstraction for file based swap.
Signed-off-by Christoph Hellwig <[email protected]>
Cc Dan Williams <[email protected]>
Cc Dave Jiang <[email protected]>
Cc Ira Weiny <[email protected]>
Cc Jens Axboe <[email protected]>
Cc Keith Busch <[email protected]>
Cc Minchan Kim <[email protected]>
Cc Sergey Senozhatsky <[email protected]>
Cc Vishal Verma <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
---
mm/page_io.c renamed from mm/page_io.c~mm-factor-out-a-swap_writepage_bdev-helper +19 -14
@@ -326,23 +326,12 @@ static void swap_writepage_fs(struct pag *wbc->swap_plug = sio; } -void __swap_writepage (struct page *page,struct writeback_control *wbc) +static void swap_writepage_bdev (struct page *page, +struct writeback_control *wbc,struct swap_info_struct *sis) {struct bio *bio; -int ret; -struct swap_info_struct *sis =page_swap_info (page); - -VM_BUG_ON_PAGE (!PageSwapCache (page), page); -/* -* ->flags can be updated non-atomicially (scan_swap_map_slots), -* but that will never affect SWP_FS_OPS, so the data_race -* is safe. -*/ -if (data_race (sis->flags &SWP_FS_OPS )) -return swap_writepage_fs (page, wbc); - ret =bdev_write_page (sis->bdev,swap_page_sector (page), page, wbc); -if (!ret) { +if (!bdev_write_page (sis->bdev,swap_page_sector (page), page, wbc)) {count_swpout_vm_event (page);return ; }
@@ -361,6 +350,22 @@ void __swap_writepage(struct page *page,submit_bio (bio); } +void __swap_writepage (struct page *page,struct writeback_control *wbc) +{ +struct swap_info_struct *sis =page_swap_info (page); + +VM_BUG_ON_PAGE (!PageSwapCache (page), page); +/* +* ->flags can be updated non-atomicially (scan_swap_map_slots), +* but that will never affect SWP_FS_OPS, so the data_race +* is safe. +*/ +if (data_race (sis->flags &SWP_FS_OPS )) +swap_writepage_fs (page, wbc); +else +swap_writepage_bdev (page, wbc, sis); +} +void swap_write_unplug (struct swap_iocb *sio) {struct iov_iter from;
_
Patches currently in -mm which might be from [email protected] are