Skip to content

Commit 5e41465

Browse files
author
Matthew Wilcox (Oracle)
committed
ceph: Convert to release_folio
Use a folio throughout ceph_release_folio(). Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org> Reviewed-by: Jeff Layton <jlayton@kernel.org>
1 parent f913cff commit 5e41465

1 file changed

Lines changed: 12 additions & 12 deletions

File tree

fs/ceph/addr.c

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -162,24 +162,24 @@ static void ceph_invalidate_folio(struct folio *folio, size_t offset,
162162
folio_wait_fscache(folio);
163163
}
164164

165-
static int ceph_releasepage(struct page *page, gfp_t gfp)
165+
static bool ceph_release_folio(struct folio *folio, gfp_t gfp)
166166
{
167-
struct inode *inode = page->mapping->host;
167+
struct inode *inode = folio->mapping->host;
168168

169-
dout("%llx:%llx releasepage %p idx %lu (%sdirty)\n",
170-
ceph_vinop(inode), page,
171-
page->index, PageDirty(page) ? "" : "not ");
169+
dout("%llx:%llx release_folio idx %lu (%sdirty)\n",
170+
ceph_vinop(inode),
171+
folio->index, folio_test_dirty(folio) ? "" : "not ");
172172

173-
if (PagePrivate(page))
174-
return 0;
173+
if (folio_test_private(folio))
174+
return false;
175175

176-
if (PageFsCache(page)) {
176+
if (folio_test_fscache(folio)) {
177177
if (current_is_kswapd() || !(gfp & __GFP_FS))
178-
return 0;
179-
wait_on_page_fscache(page);
178+
return false;
179+
folio_wait_fscache(folio);
180180
}
181181
ceph_fscache_note_page_release(inode);
182-
return 1;
182+
return true;
183183
}
184184

185185
static void ceph_netfs_expand_readahead(struct netfs_io_request *rreq)
@@ -1380,7 +1380,7 @@ const struct address_space_operations ceph_aops = {
13801380
.write_end = ceph_write_end,
13811381
.dirty_folio = ceph_dirty_folio,
13821382
.invalidate_folio = ceph_invalidate_folio,
1383-
.releasepage = ceph_releasepage,
1383+
.release_folio = ceph_release_folio,
13841384
.direct_IO = noop_direct_IO,
13851385
};
13861386

0 commit comments

Comments
 (0)