]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
ocfs2: Convert to release_folio
authorMatthew Wilcox (Oracle) <willy@infradead.org>
Sun, 1 May 2022 04:10:21 +0000 (00:10 -0400)
committerMatthew Wilcox (Oracle) <willy@infradead.org>
Tue, 10 May 2022 03:12:33 +0000 (23:12 -0400)
Use folios throughout the release_folio path.

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

index 6b1679db96369909749feae27e9f76ef3d1aff56..7d7b86ca078fad6c9e2650bd8a8f539b2bc64aae 100644 (file)
@@ -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,