From: Baoquan He <baoquan.he@linux.dev>
To: linux-mm@kvack.org
Cc: akpm@linux-foundation.org, chrisl@kernel.org,
usama.arif@linux.dev, baohua@kernel.org, kasong@tencent.com,
nphamcs@gmail.com, shikemeng@huaweicloud.com,
youngjun.park@lge.com, hch@infradead.org,
linux-kernel@vger.kernel.org, Baoquan He <baoquan.he@linux.dev>
Subject: [PATCH v7 2/3] mm/page_io.c: rename page_io functions to consistent naming
Date: Fri, 15 May 2026 09:57:36 +0800 [thread overview]
Message-ID: <20260515015737.890994-3-baoquan.he@linux.dev> (raw)
In-Reply-To: <20260515015737.890994-1-baoquan.he@linux.dev>
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@linux.dev>
---
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
next prev parent reply other threads:[~2026-05-15 1:58 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-05-15 1:57 [PATCH v7 0/3] [PATCH v7 0/3] mm/swap: use swap_ops to register swap device's methods Baoquan He
2026-05-15 1:57 ` [PATCH v7 1/3] " Baoquan He
2026-05-15 1:57 ` Baoquan He [this message]
2026-05-15 1:57 ` [PATCH v7 3/3] mm/swap: add unplug callback to swap_ops to fix leaky abstraction Baoquan He
2026-05-15 4:39 ` Barry Song
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260515015737.890994-3-baoquan.he@linux.dev \
--to=baoquan.he@linux.dev \
--cc=akpm@linux-foundation.org \
--cc=baohua@kernel.org \
--cc=chrisl@kernel.org \
--cc=hch@infradead.org \
--cc=kasong@tencent.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=nphamcs@gmail.com \
--cc=shikemeng@huaweicloud.com \
--cc=usama.arif@linux.dev \
--cc=youngjun.park@lge.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.