[PATCH 3/3] gfs2: remove the remaining page references in the log code
From: Tal Zussman
Date: Tue Nov 17 2026 - 02:46:48 EST
gfs2_jhead_process_page() takes a folio, and the comments around it and
gfs2_end_log_read() still describe folios as pages. Rename it to
gfs2_jhead_process_folio() and update the comments.
Drop the struct page forward declaration from bmap.h as well, which has
had no user since the unstuff path was converted.
Signed-off-by: Tal Zussman <tz2294@xxxxxxxxxxxx>
---
fs/gfs2/bmap.h | 1 -
fs/gfs2/lops.c | 18 +++++++++---------
2 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/fs/gfs2/bmap.h b/fs/gfs2/bmap.h
index e3d6efdfd890..7b44cc9c742c 100644
--- a/fs/gfs2/bmap.h
+++ b/fs/gfs2/bmap.h
@@ -13,7 +13,6 @@
struct inode;
struct gfs2_inode;
-struct page;
/**
diff --git a/fs/gfs2/lops.c b/fs/gfs2/lops.c
index c86f92f2e508..805466667e8a 100644
--- a/fs/gfs2/lops.c
+++ b/fs/gfs2/lops.c
@@ -446,7 +446,7 @@ static void gfs2_log_write_block(struct gfs2_sbd *sdp, void *buf)
* gfs2_end_log_read - end I/O callback for reads from the log
* @bio: The bio
*
- * Simply unlock the pages in the bio. The main thread will wait on them and
+ * Simply unlock the folios in the bio. The main thread will wait on them and
* process them in order as necessary.
*/
static void gfs2_end_log_read(struct bio *bio)
@@ -464,7 +464,7 @@ static void gfs2_end_log_read(struct bio *bio)
}
/**
- * gfs2_jhead_folio_search - Look for the journal head in a given page.
+ * gfs2_jhead_folio_search - Look for the journal head in a given folio.
* @jd: The journal descriptor
* @head: The journal head to start from
* @folio: The folio to look in
@@ -498,9 +498,9 @@ static bool gfs2_jhead_folio_search(struct gfs2_jdesc *jd,
}
/**
- * gfs2_jhead_process_page - Search/cleanup a page
+ * gfs2_jhead_process_folio - Search/cleanup a folio
* @jd: The journal descriptor
- * @index: Index of the page to look into
+ * @index: Index of the folio to look into
* @head: The journal head to start from
* @done: If set, perform only cleanup, else search and set if found.
*
@@ -517,9 +517,9 @@ static bool gfs2_jhead_folio_search(struct gfs2_jdesc *jd,
* our references to the folio.
*/
-static void gfs2_jhead_process_page(struct gfs2_jdesc *jd, unsigned long index,
- struct gfs2_log_header_host *head,
- bool *done)
+static void gfs2_jhead_process_folio(struct gfs2_jdesc *jd, unsigned long index,
+ struct gfs2_log_header_host *head,
+ bool *done)
{
struct folio *folio;
@@ -630,7 +630,7 @@ int gfs2_find_jhead(struct gfs2_jdesc *jd, struct gfs2_log_header_host *head)
continue;
}
- gfs2_jhead_process_page(jd, blocks_read >> shift, head, &done);
+ gfs2_jhead_process_folio(jd, blocks_read >> shift, head, &done);
blocks_read += PAGE_SIZE >> bsize_shift;
if (done)
goto out; /* found */
@@ -641,7 +641,7 @@ int gfs2_find_jhead(struct gfs2_jdesc *jd, struct gfs2_log_header_host *head)
if (bio)
submit_bio(bio);
while (blocks_read < block) {
- gfs2_jhead_process_page(jd, blocks_read >> shift, head, &done);
+ gfs2_jhead_process_folio(jd, blocks_read >> shift, head, &done);
blocks_read += PAGE_SIZE >> bsize_shift;
}
--
2.39.5