Skip to content

Commit 1252ad1

Browse files
Matthew Wilcox (Oracle)kleikamp
authored andcommitted
jfs: Convert force_metapage to use a folio
Convert the mp->page to a folio and operate on it. That lets us convert metapage_write_one() to take a folio. Replaces five calls to compound_head() with one. Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org> Signed-off-by: Dave Kleikamp <dave.kleikamp@oracle.com>
1 parent d9c3600 commit 1252ad1

File tree

1 file changed

+8
-9
lines changed

1 file changed

+8
-9
lines changed

fs/jfs/jfs_metapage.c

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -689,9 +689,8 @@ void grab_metapage(struct metapage * mp)
689689
unlock_page(mp->page);
690690
}
691691

692-
static int metapage_write_one(struct page *page)
692+
static int metapage_write_one(struct folio *folio)
693693
{
694-
struct folio *folio = page_folio(page);
695694
struct address_space *mapping = folio->mapping;
696695
struct writeback_control wbc = {
697696
.sync_mode = WB_SYNC_ALL,
@@ -720,17 +719,17 @@ static int metapage_write_one(struct page *page)
720719

721720
void force_metapage(struct metapage *mp)
722721
{
723-
struct page *page = mp->page;
722+
struct folio *folio = page_folio(mp->page);
724723
jfs_info("force_metapage: mp = 0x%p", mp);
725724
set_bit(META_forcewrite, &mp->flag);
726725
clear_bit(META_sync, &mp->flag);
727-
get_page(page);
728-
lock_page(page);
729-
set_page_dirty(page);
730-
if (metapage_write_one(page))
726+
folio_get(folio);
727+
folio_lock(folio);
728+
folio_mark_dirty(folio);
729+
if (metapage_write_one(folio))
731730
jfs_error(mp->sb, "metapage_write_one() failed\n");
732731
clear_bit(META_forcewrite, &mp->flag);
733-
put_page(page);
732+
folio_put(folio);
734733
}
735734

736735
void hold_metapage(struct metapage *mp)
@@ -771,7 +770,7 @@ void release_metapage(struct metapage * mp)
771770
folio_mark_dirty(folio);
772771
if (test_bit(META_sync, &mp->flag)) {
773772
clear_bit(META_sync, &mp->flag);
774-
if (metapage_write_one(&folio->page))
773+
if (metapage_write_one(folio))
775774
jfs_error(mp->sb, "metapage_write_one() failed\n");
776775
folio_lock(folio);
777776
}

0 commit comments

Comments
 (0)