[PATCH v4 3/3] mm/swap_io.c: rename swap_writepage_* to swap_write_folio_*
From: Baoquan He
Date: Thu Apr 16 2026 - 23:43:39 EST
All these swap_writepage_* functions handle a passed-in folio,
not a page. This renaming makes them consistent with their
counterpart swap_read_folio_* functions.
Reviewed-by: Barry Song <baohua@xxxxxxxxxx>
Reviewed-by: Nhat Pham <nphamcs@xxxxxxxxx>
Acked-by: Chris Li <chrisl@xxxxxxxxxx>
Signed-off-by: Baoquan He <baoquan.he@xxxxxxxxx>
---
mm/swap_io.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/mm/swap_io.c b/mm/swap_io.c
index 1b054a122f53..50a16148b919 100644
--- a/mm/swap_io.c
+++ b/mm/swap_io.c
@@ -370,7 +370,7 @@ static void sio_write_complete(struct kiocb *iocb, long ret)
mempool_free(sio, sio_pool);
}
-static void swap_writepage_fs(struct swap_info_struct *sis,
+static void swap_write_folio_fs(struct swap_info_struct *sis,
struct folio *folio,
struct swap_iocb **swap_plug)
{
@@ -407,7 +407,7 @@ static void swap_writepage_fs(struct swap_info_struct *sis,
*swap_plug = sio;
}
-static void swap_writepage_bdev_sync(struct swap_info_struct *sis,
+static void swap_write_folio_bdev_sync(struct swap_info_struct *sis,
struct folio *folio,
struct swap_iocb **plug)
{
@@ -428,7 +428,7 @@ static void swap_writepage_bdev_sync(struct swap_info_struct *sis,
__end_swap_bio_write(&bio);
}
-static void swap_writepage_bdev_async(struct swap_info_struct *sis,
+static void swap_write_folio_bdev_async(struct swap_info_struct *sis,
struct folio *folio,
struct swap_iocb **plug)
{
@@ -590,17 +590,17 @@ static void swap_read_folio_bdev_async(struct swap_info_struct *sis,
static const struct swap_ops bdev_fs_swap_ops = {
.read_folio = swap_read_folio_fs,
- .write_folio = swap_writepage_fs,
+ .write_folio = swap_write_folio_fs,
};
static const struct swap_ops bdev_sync_swap_ops = {
.read_folio = swap_read_folio_bdev_sync,
- .write_folio = swap_writepage_bdev_sync,
+ .write_folio = swap_write_folio_bdev_sync,
};
static const struct swap_ops bdev_async_swap_ops = {
.read_folio = swap_read_folio_bdev_async,
- .write_folio = swap_writepage_bdev_async,
+ .write_folio = swap_write_folio_bdev_async,
};
int init_swap_ops(struct swap_info_struct *sis)
--
2.52.0