[PATCH v7 2/3] mm/page_io.c: rename page_io functions to consistent naming

[Baoquan He]

Rename the swap I/O functions to use a consistent
swap_<backend>_<op>_<folio> naming scheme, so the backend type
immediately follows the swap_ prefix. The new names align with
swap_ops callbacks: .write_folio and .read_folio.

  swap_writepage_fs          ->  swap_fs_write_folio
  swap_writepage_bdev_sync   ->  swap_bdev_sync_write_folio
  swap_writepage_bdev_async  ->  swap_bdev_async_write_folio
  swap_read_folio_fs         ->  swap_fs_read_folio
  swap_read_folio_bdev_sync  ->  swap_bdev_sync_read_folio
  swap_read_folio_bdev_async ->  swap_bdev_async_read_folio

Signed-off-by: Baoquan He <baoquan.he@xxxxxxxxx>
---
 mm/page_io.c | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/mm/page_io.c b/mm/page_io.c
index 2b520af88376..38b94c560c37 100644
--- a/mm/page_io.c
+++ b/mm/page_io.c
@@ -378,7 +378,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_fs_write_folio(struct swap_info_struct *sis,
 			      struct folio *folio,
 			      struct swap_iocb **swap_plug)
 {
@@ -415,7 +415,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_bdev_sync_write_folio(struct swap_info_struct *sis,
 				     struct folio *folio,
 				     struct swap_iocb **plug)
 {
@@ -436,7 +436,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_bdev_async_write_folio(struct swap_info_struct *sis,
 				      struct folio *folio,
 				      struct swap_iocb **plug)
 {
@@ -522,7 +522,7 @@ static bool swap_read_folio_zeromap(struct folio *folio)
 	return true;
 }
 
-static void swap_read_folio_fs(struct swap_info_struct *sis,
+static void swap_fs_read_folio(struct swap_info_struct *sis,
 			       struct folio *folio,
 			       struct swap_iocb **plug)
 {
@@ -557,7 +557,7 @@ static void swap_read_folio_fs(struct swap_info_struct *sis,
 		*plug = sio;
 }
 
-static void swap_read_folio_bdev_sync(struct swap_info_struct *sis,
+static void swap_bdev_sync_read_folio(struct swap_info_struct *sis,
 				      struct folio *folio,
 				      struct swap_iocb **plug)
 {
@@ -580,7 +580,7 @@ static void swap_read_folio_bdev_sync(struct swap_info_struct *sis,
 	put_task_struct(current);
 }
 
-static void swap_read_folio_bdev_async(struct swap_info_struct *sis,
+static void swap_bdev_async_read_folio(struct swap_info_struct *sis,
 				       struct folio *folio,
 				       struct swap_iocb **plug)
 {
@@ -597,18 +597,18 @@ 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,
+	.read_folio = swap_fs_read_folio,
+	.write_folio = swap_fs_write_folio,
 };
 
 static const struct swap_ops bdev_sync_swap_ops = {
-	.read_folio = swap_read_folio_bdev_sync,
-	.write_folio = swap_writepage_bdev_sync,
+	.read_folio = swap_bdev_sync_read_folio,
+	.write_folio = swap_bdev_sync_write_folio,
 };
 
 static const struct swap_ops bdev_async_swap_ops = {
-	.read_folio = swap_read_folio_bdev_async,
-	.write_folio = swap_writepage_bdev_async,
+	.read_folio = swap_bdev_async_read_folio,
+	.write_folio = swap_bdev_async_write_folio,
 };
 
 int init_swap_ops(struct swap_info_struct *sis)
-- 
2.52.0