Skip to content

Commit 40e1bd1

Browse files
Matthew Wilcox (Oracle)kleikamp
authored andcommitted
jfs; Convert release_metapage to use a folio
Convert mp->page to a folio and remove 7 hidden calls to compound_head(). Signed-off-by: Matthew Wilcox (Oracle) <[email protected]> Signed-off-by: Dave Kleikamp <[email protected]>
1 parent 9346476 commit 40e1bd1

File tree

1 file changed

+10
-12
lines changed

1 file changed

+10
-12
lines changed

fs/jfs/jfs_metapage.c

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -749,37 +749,35 @@ void put_metapage(struct metapage *mp)
749749

750750
void release_metapage(struct metapage * mp)
751751
{
752-
struct page *page = mp->page;
752+
struct folio *folio = page_folio(mp->page);
753753
jfs_info("release_metapage: mp = 0x%p, flag = 0x%lx", mp, mp->flag);
754754

755-
BUG_ON(!page);
756-
757-
lock_page(page);
755+
folio_lock(folio);
758756
unlock_metapage(mp);
759757

760758
assert(mp->count);
761759
if (--mp->count || mp->nohomeok) {
762-
unlock_page(page);
763-
put_page(page);
760+
folio_unlock(folio);
761+
folio_put(folio);
764762
return;
765763
}
766764

767765
if (test_bit(META_dirty, &mp->flag)) {
768-
set_page_dirty(page);
766+
folio_mark_dirty(folio);
769767
if (test_bit(META_sync, &mp->flag)) {
770768
clear_bit(META_sync, &mp->flag);
771-
if (metapage_write_one(page))
769+
if (metapage_write_one(&folio->page))
772770
jfs_error(mp->sb, "metapage_write_one() failed\n");
773-
lock_page(page);
771+
folio_lock(folio);
774772
}
775773
} else if (mp->lsn) /* discard_metapage doesn't remove it */
776774
remove_from_logsync(mp);
777775

778776
/* Try to keep metapages from using up too much memory */
779-
drop_metapage(page, mp);
777+
drop_metapage(&folio->page, mp);
780778

781-
unlock_page(page);
782-
put_page(page);
779+
folio_unlock(folio);
780+
folio_put(folio);
783781
}
784782

785783
void __invalidate_metapages(struct inode *ip, s64 addr, int len)

0 commit comments

Comments
 (0)