9p: Convert to release_folio
authorMatthew Wilcox (Oracle) <willy@infradead.org>
Sun, 1 May 2022 03:05:09 +0000 (23:05 -0400)
committerMatthew Wilcox (Oracle) <willy@infradead.org>
Tue, 10 May 2022 03:12:32 +0000 (23:12 -0400)
A straightforward conversion as it already works in terms of folios.

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

index 3a84167f489351f32691736457e7b6d62c2edb4c..8ce82ff1e40afdabf152b968b3a245f7ef158636 100644 (file)
@@ -100,29 +100,28 @@ const struct netfs_request_ops v9fs_req_ops = {
 };
 
 /**
- * v9fs_release_page - release the private state associated with a page
- * @page: The page to be released
+ * v9fs_release_folio - release the private state associated with a folio
+ * @folio: The folio to be released
  * @gfp: The caller's allocation restrictions
  *
- * Returns 1 if the page can be released, false otherwise.
+ * Returns true if the page can be released, false otherwise.
  */
 
-static int v9fs_release_page(struct page *page, gfp_t gfp)
+static bool v9fs_release_folio(struct folio *folio, gfp_t gfp)
 {
-       struct folio *folio = page_folio(page);
        struct inode *inode = folio_inode(folio);
 
        if (folio_test_private(folio))
-               return 0;
+               return false;
 #ifdef CONFIG_9P_FSCACHE
        if (folio_test_fscache(folio)) {
                if (current_is_kswapd() || !(gfp & __GFP_FS))
-                       return 0;
+                       return false;
                folio_wait_fscache(folio);
        }
 #endif
        fscache_note_page_release(v9fs_inode_cookie(V9FS_I(inode)));
-       return 1;
+       return true;
 }
 
 static void v9fs_invalidate_folio(struct folio *folio, size_t offset,
@@ -342,7 +341,7 @@ const struct address_space_operations v9fs_addr_operations = {
        .writepage = v9fs_vfs_writepage,
        .write_begin = v9fs_write_begin,
        .write_end = v9fs_write_end,
-       .releasepage = v9fs_release_page,
+       .release_folio = v9fs_release_folio,
        .invalidate_folio = v9fs_invalidate_folio,
        .launder_folio = v9fs_launder_folio,
        .direct_IO = v9fs_direct_IO,