diff options
| author | Matthew Wilcox (Oracle) <willy@infradead.org> | 2022-04-30 23:53:28 -0400 |
|---|---|---|
| committer | Matthew Wilcox (Oracle) <willy@infradead.org> | 2022-05-09 23:12:33 -0400 |
| commit | 3577da4aa895847da74890903a3ae7e67ba1ee2f (patch) | |
| tree | 4353e0a193ad83bd2044ce784b047e02b4cfcf4c /fs/nfs/file.c | |
| parent | a613b861aabebb13ec08b5791075fe38ad361ba0 (diff) | |
| download | lwn-3577da4aa895847da74890903a3ae7e67ba1ee2f.tar.gz lwn-3577da4aa895847da74890903a3ae7e67ba1ee2f.zip | |
nfs: Convert to release_folio
Use folios throughout the release_folio paths.
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Reviewed-by: Jeff Layton <jlayton@kernel.org>
Diffstat (limited to 'fs/nfs/file.c')
| -rw-r--r-- | fs/nfs/file.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/fs/nfs/file.c b/fs/nfs/file.c index 4f6d1f90b87f..d764b3ce7905 100644 --- a/fs/nfs/file.c +++ b/fs/nfs/file.c @@ -415,19 +415,19 @@ static void nfs_invalidate_folio(struct folio *folio, size_t offset, } /* - * Attempt to release the private state associated with a page - * - Called if either PG_private or PG_fscache is set on the page - * - Caller holds page lock - * - Return true (may release page) or false (may not) + * Attempt to release the private state associated with a folio + * - Called if either private or fscache flags are set on the folio + * - Caller holds folio lock + * - Return true (may release folio) or false (may not) */ -static int nfs_release_page(struct page *page, gfp_t gfp) +static bool nfs_release_folio(struct folio *folio, gfp_t gfp) { - dfprintk(PAGECACHE, "NFS: release_page(%p)\n", page); + dfprintk(PAGECACHE, "NFS: release_folio(%p)\n", folio); - /* If PagePrivate() is set, then the page is not freeable */ - if (PagePrivate(page)) - return 0; - return nfs_fscache_release_page(page, gfp); + /* If the private flag is set, then the folio is not freeable */ + if (folio_test_private(folio)) + return false; + return nfs_fscache_release_folio(folio, gfp); } static void nfs_check_dirty_writeback(struct folio *folio, @@ -522,7 +522,7 @@ const struct address_space_operations nfs_file_aops = { .write_begin = nfs_write_begin, .write_end = nfs_write_end, .invalidate_folio = nfs_invalidate_folio, - .releasepage = nfs_release_page, + .release_folio = nfs_release_folio, .direct_IO = nfs_direct_IO, #ifdef CONFIG_MIGRATION .migratepage = nfs_migrate_page, |