[PATCH 09/16] squashfs: give the folio page actor helpers their old names back

[Tal Zussman]

With the page actor gone, the folio actor doesn't need new names.
Rename squashfs_page_actor_free_folios() back to
squashfs_page_actor_free() and the direct_folio_*_page() callbacks back
to direct_*_page(). No functional change.

Signed-off-by: Tal Zussman <tz2294@xxxxxxxxxxxx>
---
 fs/squashfs/file.c        |  6 +++---
 fs/squashfs/file_direct.c |  2 +-
 fs/squashfs/page_actor.c  | 12 ++++++------
 fs/squashfs/page_actor.h  |  2 +-
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/fs/squashfs/file.c b/fs/squashfs/file.c
index 2f37de8def31..e024d2e21246 100644
--- a/fs/squashfs/file.c
+++ b/fs/squashfs/file.c
@@ -544,7 +544,7 @@ static int squashfs_readahead_fragment(struct inode *inode,
 		addr = squashfs_next_page(actor);
 	}
 
-	last_folio = squashfs_page_actor_free_folios(actor);
+	last_folio = squashfs_page_actor_free(actor);
 
 	ok = copied == expected && !IS_ERR(last_folio);
 
@@ -564,7 +564,7 @@ static int squashfs_readahead_fragment(struct inode *inode,
 
 failed:
 	squashfs_finish_page(actor);
-	squashfs_page_actor_free_folios(actor);
+	squashfs_page_actor_free(actor);
 
 out:
 	squashfs_cache_put(buffer);
@@ -636,7 +636,7 @@ static void squashfs_readahead(struct readahead_control *ractl)
 
 		res = squashfs_read_data(inode->i_sb, block, bsize, NULL, actor);
 
-		last_folio = squashfs_page_actor_free_folios(actor);
+		last_folio = squashfs_page_actor_free(actor);
 
 		ok = res == expected && !IS_ERR(last_folio);
 
diff --git a/fs/squashfs/file_direct.c b/fs/squashfs/file_direct.c
index 55286dab03d2..266b5fdea67a 100644
--- a/fs/squashfs/file_direct.c
+++ b/fs/squashfs/file_direct.c
@@ -79,7 +79,7 @@ int squashfs_readpage_block(struct folio *folio, u64 block, int bsize,
 	/* Decompress directly into the page cache buffers */
 	res = squashfs_read_data(inode->i_sb, block, bsize, NULL, actor);
 
-	last_folio = squashfs_page_actor_free_folios(actor);
+	last_folio = squashfs_page_actor_free(actor);
 
 	if (res < 0)
 		goto mark_errored;
diff --git a/fs/squashfs/page_actor.c b/fs/squashfs/page_actor.c
index 8cf6c956d802..185365c1afda 100644
--- a/fs/squashfs/page_actor.c
+++ b/fs/squashfs/page_actor.c
@@ -87,12 +87,12 @@ static void *handle_next_folio(struct squashfs_page_actor *actor)
 	return actor->alloc_buffer ? actor->tmp_buffer : ERR_PTR(-ENOMEM);
 }
 
-static void *direct_folio_first_page(struct squashfs_page_actor *actor)
+static void *direct_first_page(struct squashfs_page_actor *actor)
 {
 	return handle_next_folio(actor);
 }
 
-static void *direct_folio_next_page(struct squashfs_page_actor *actor)
+static void *direct_next_page(struct squashfs_page_actor *actor)
 {
 	if (actor->pageaddr) {
 		kunmap_local(actor->pageaddr);
@@ -102,7 +102,7 @@ static void *direct_folio_next_page(struct squashfs_page_actor *actor)
 	return handle_next_folio(actor);
 }
 
-static void direct_folio_finish_page(struct squashfs_page_actor *actor)
+static void direct_finish_page(struct squashfs_page_actor *actor)
 {
 	if (actor->pageaddr)
 		kunmap_local(actor->pageaddr);
@@ -135,8 +135,8 @@ struct squashfs_page_actor *squashfs_page_actor_init_folios(struct squashfs_sb_i
 	actor->pageaddr = NULL;
 	actor->last_folio = NULL;
 	actor->alloc_buffer = msblk->decompressor->alloc_buffer;
-	actor->squashfs_first_page = direct_folio_first_page;
-	actor->squashfs_next_page = direct_folio_next_page;
-	actor->squashfs_finish_page = direct_folio_finish_page;
+	actor->squashfs_first_page = direct_first_page;
+	actor->squashfs_next_page = direct_next_page;
+	actor->squashfs_finish_page = direct_finish_page;
 	return actor;
 }
diff --git a/fs/squashfs/page_actor.h b/fs/squashfs/page_actor.h
index 3a98bf691ba3..bc4f44122ddc 100644
--- a/fs/squashfs/page_actor.h
+++ b/fs/squashfs/page_actor.h
@@ -31,7 +31,7 @@ struct squashfs_page_actor *squashfs_page_actor_init_folios(
 				struct squashfs_sb_info *msblk,
 				struct folio **folio, int nr_folios, int length,
 				loff_t start);
-static inline struct folio *squashfs_page_actor_free_folios(struct squashfs_page_actor *actor)
+static inline struct folio *squashfs_page_actor_free(struct squashfs_page_actor *actor)
 {
 	struct folio *last_folio = actor->next_page == actor->pages ?
 				   actor->last_folio : ERR_PTR(-EIO);

-- 
2.39.5