Skip to content

Commit a613b86

Browse files
author
Matthew Wilcox (Oracle)
committed
jfs: Convert to release_folio
The use of folios should be pushed further down into jfs from here. Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org> Reviewed-by: Jeff Layton <jlayton@kernel.org>
1 parent 7ffce3d commit a613b86

1 file changed

Lines changed: 8 additions & 8 deletions

File tree

fs/jfs/jfs_metapage.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -524,29 +524,29 @@ static int metapage_read_folio(struct file *fp, struct folio *folio)
524524
return -EIO;
525525
}
526526

527-
static int metapage_releasepage(struct page *page, gfp_t gfp_mask)
527+
static bool metapage_release_folio(struct folio *folio, gfp_t gfp_mask)
528528
{
529529
struct metapage *mp;
530-
int ret = 1;
530+
bool ret = true;
531531
int offset;
532532

533533
for (offset = 0; offset < PAGE_SIZE; offset += PSIZE) {
534-
mp = page_to_mp(page, offset);
534+
mp = page_to_mp(&folio->page, offset);
535535

536536
if (!mp)
537537
continue;
538538

539-
jfs_info("metapage_releasepage: mp = 0x%p", mp);
539+
jfs_info("metapage_release_folio: mp = 0x%p", mp);
540540
if (mp->count || mp->nohomeok ||
541541
test_bit(META_dirty, &mp->flag)) {
542542
jfs_info("count = %ld, nohomeok = %d", mp->count,
543543
mp->nohomeok);
544-
ret = 0;
544+
ret = false;
545545
continue;
546546
}
547547
if (mp->lsn)
548548
remove_from_logsync(mp);
549-
remove_metapage(page, mp);
549+
remove_metapage(&folio->page, mp);
550550
INCREMENT(mpStat.pagefree);
551551
free_metapage(mp);
552552
}
@@ -560,13 +560,13 @@ static void metapage_invalidate_folio(struct folio *folio, size_t offset,
560560

561561
BUG_ON(folio_test_writeback(folio));
562562

563-
metapage_releasepage(&folio->page, 0);
563+
metapage_release_folio(folio, 0);
564564
}
565565

566566
const struct address_space_operations jfs_metapage_aops = {
567567
.read_folio = metapage_read_folio,
568568
.writepage = metapage_writepage,
569-
.releasepage = metapage_releasepage,
569+
.release_folio = metapage_release_folio,
570570
.invalidate_folio = metapage_invalidate_folio,
571571
.dirty_folio = filemap_dirty_folio,
572572
};

0 commit comments

Comments
 (0)