Skip to content

Commit 3c402f1

Browse files
author
Matthew Wilcox (Oracle)
committed
ext4: Convert to release_folio
The use of folios should be pushed deeper into ext4 from here. Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org> Acked-by: Theodore Ts'o <tytso@mit.edu> Reviewed-by: Jeff Layton <jlayton@kernel.org>
1 parent 8c5de05 commit 3c402f1

1 file changed

Lines changed: 10 additions & 10 deletions

File tree

fs/ext4/inode.c

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3243,19 +3243,19 @@ static void ext4_journalled_invalidate_folio(struct folio *folio,
32433243
WARN_ON(__ext4_journalled_invalidate_folio(folio, offset, length) < 0);
32443244
}
32453245

3246-
static int ext4_releasepage(struct page *page, gfp_t wait)
3246+
static bool ext4_release_folio(struct folio *folio, gfp_t wait)
32473247
{
3248-
journal_t *journal = EXT4_JOURNAL(page->mapping->host);
3248+
journal_t *journal = EXT4_JOURNAL(folio->mapping->host);
32493249

3250-
trace_ext4_releasepage(page);
3250+
trace_ext4_releasepage(&folio->page);
32513251

32523252
/* Page has dirty journalled data -> cannot release */
3253-
if (PageChecked(page))
3254-
return 0;
3253+
if (folio_test_checked(folio))
3254+
return false;
32553255
if (journal)
3256-
return jbd2_journal_try_to_free_buffers(journal, page);
3256+
return jbd2_journal_try_to_free_buffers(journal, &folio->page);
32573257
else
3258-
return try_to_free_buffers(page);
3258+
return try_to_free_buffers(&folio->page);
32593259
}
32603260

32613261
static bool ext4_inode_datasync_dirty(struct inode *inode)
@@ -3618,7 +3618,7 @@ static const struct address_space_operations ext4_aops = {
36183618
.dirty_folio = ext4_dirty_folio,
36193619
.bmap = ext4_bmap,
36203620
.invalidate_folio = ext4_invalidate_folio,
3621-
.releasepage = ext4_releasepage,
3621+
.release_folio = ext4_release_folio,
36223622
.direct_IO = noop_direct_IO,
36233623
.migratepage = buffer_migrate_page,
36243624
.is_partially_uptodate = block_is_partially_uptodate,
@@ -3636,7 +3636,7 @@ static const struct address_space_operations ext4_journalled_aops = {
36363636
.dirty_folio = ext4_journalled_dirty_folio,
36373637
.bmap = ext4_bmap,
36383638
.invalidate_folio = ext4_journalled_invalidate_folio,
3639-
.releasepage = ext4_releasepage,
3639+
.release_folio = ext4_release_folio,
36403640
.direct_IO = noop_direct_IO,
36413641
.is_partially_uptodate = block_is_partially_uptodate,
36423642
.error_remove_page = generic_error_remove_page,
@@ -3653,7 +3653,7 @@ static const struct address_space_operations ext4_da_aops = {
36533653
.dirty_folio = ext4_dirty_folio,
36543654
.bmap = ext4_bmap,
36553655
.invalidate_folio = ext4_invalidate_folio,
3656-
.releasepage = ext4_releasepage,
3656+
.release_folio = ext4_release_folio,
36573657
.direct_IO = noop_direct_IO,
36583658
.migratepage = buffer_migrate_page,
36593659
.is_partially_uptodate = block_is_partially_uptodate,

0 commit comments

Comments
 (0)