From: Matthew Wilcox (Oracle) <willy@infradead.org>
Date: Sun, 1 May 2022 04:10:21 +0000 (-0400)
Subject: ocfs2: Convert to release_folio
X-Git-Tag: v5.19-rc1~169^2~16
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=eca66389744df54ee98f02a232774e47be75f16a;p=thirdparty%2Fkernel%2Flinux.git

ocfs2: Convert to release_folio

Use folios throughout the release_folio path.

Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Reviewed-by: Jeff Layton <jlayton@kernel.org>
---

diff --git a/fs/ocfs2/aops.c b/fs/ocfs2/aops.c
index 6b1679db96369..7d7b86ca078fa 100644
--- a/fs/ocfs2/aops.c
+++ b/fs/ocfs2/aops.c
@@ -498,11 +498,11 @@ bail:
 	return status;
 }
 
-static int ocfs2_releasepage(struct page *page, gfp_t wait)
+static bool ocfs2_release_folio(struct folio *folio, gfp_t wait)
 {
-	if (!page_has_buffers(page))
-		return 0;
-	return try_to_free_buffers(page);
+	if (!folio_buffers(folio))
+		return false;
+	return try_to_free_buffers(&folio->page);
 }
 
 static void ocfs2_figure_cluster_boundaries(struct ocfs2_super *osb,
@@ -2463,7 +2463,7 @@ const struct address_space_operations ocfs2_aops = {
 	.bmap			= ocfs2_bmap,
 	.direct_IO		= ocfs2_direct_IO,
 	.invalidate_folio	= block_invalidate_folio,
-	.releasepage		= ocfs2_releasepage,
+	.release_folio		= ocfs2_release_folio,
 	.migratepage		= buffer_migrate_page,
 	.is_partially_uptodate	= block_is_partially_uptodate,
 	.error_remove_page	= generic_error_remove_page,