Skip to content

Commit f16ebe0

Browse files
Matthew Wilcox (Oracle)Jaegeuk Kim
authored andcommitted
f2fs: Convert clear_node_page_dirty() to clear_node_folio_dirty()
Both callers have a folio so pass it in, removing five calls to compound_head(). Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org> Reviewed-by: Chao Yu <chao@kernel.org> Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
1 parent a4d0770 commit f16ebe0

1 file changed

Lines changed: 8 additions & 8 deletions

File tree

fs/f2fs/node.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -120,14 +120,14 @@ bool f2fs_available_free_memory(struct f2fs_sb_info *sbi, int type)
120120
return res;
121121
}
122122

123-
static void clear_node_page_dirty(struct page *page)
123+
static void clear_node_folio_dirty(struct folio *folio)
124124
{
125-
if (PageDirty(page)) {
126-
f2fs_clear_page_cache_dirty_tag(page_folio(page));
127-
clear_page_dirty_for_io(page);
128-
dec_page_count(F2FS_P_SB(page), F2FS_DIRTY_NODES);
125+
if (folio_test_dirty(folio)) {
126+
f2fs_clear_page_cache_dirty_tag(folio);
127+
folio_clear_dirty_for_io(folio);
128+
dec_page_count(F2FS_F_SB(folio), F2FS_DIRTY_NODES);
129129
}
130-
ClearPageUptodate(page);
130+
folio_clear_uptodate(folio);
131131
}
132132

133133
static struct folio *get_current_nat_folio(struct f2fs_sb_info *sbi, nid_t nid)
@@ -930,7 +930,7 @@ static int truncate_node(struct dnode_of_data *dn)
930930
f2fs_inode_synced(dn->inode);
931931
}
932932

933-
clear_node_page_dirty(&dn->node_folio->page);
933+
clear_node_folio_dirty(dn->node_folio);
934934
set_sbi_flag(sbi, SBI_IS_DIRTY);
935935

936936
index = dn->node_folio->index;
@@ -1381,7 +1381,7 @@ struct folio *f2fs_new_node_folio(struct dnode_of_data *dn, unsigned int ofs)
13811381
inc_valid_inode_count(sbi);
13821382
return folio;
13831383
fail:
1384-
clear_node_page_dirty(&folio->page);
1384+
clear_node_folio_dirty(folio);
13851385
f2fs_folio_put(folio, true);
13861386
return ERR_PTR(err);
13871387
}

0 commit comments

Comments
 (0)