From: Matthew Wilcox (Oracle) Date: Tue, 18 Feb 2025 05:51:40 +0000 (+0000) Subject: f2fs: Pass a folio to flush_dirty_inode() X-Git-Tag: v6.15-rc1~151^2~46 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=de90f76144246062206daff08e7cecb6c27298d9;p=thirdparty%2Fkernel%2Flinux.git f2fs: Pass a folio to flush_dirty_inode() Its one caller now has a folio; pass it in and do page conversions where necessary inside flush_dirty_inode(). Saves two hidden calls to compound_head(). Signed-off-by: Matthew Wilcox (Oracle) Reviewed-by: Chao Yu Signed-off-by: Jaegeuk Kim --- diff --git a/fs/f2fs/node.c b/fs/f2fs/node.c index a2da7b726dbf9..ecba85f052214 100644 --- a/fs/f2fs/node.c +++ b/fs/f2fs/node.c @@ -1927,18 +1927,18 @@ static int f2fs_match_ino(struct inode *inode, unsigned long ino, void *data) return 1; } -static bool flush_dirty_inode(struct page *page) +static bool flush_dirty_inode(struct folio *folio) { - struct f2fs_sb_info *sbi = F2FS_P_SB(page); + struct f2fs_sb_info *sbi = F2FS_F_SB(folio); struct inode *inode; - nid_t ino = ino_of_node(page); + nid_t ino = ino_of_node(&folio->page); inode = find_inode_nowait(sbi->sb, ino, f2fs_match_ino, NULL); if (!inode) return false; - f2fs_update_inode(inode, page); - unlock_page(page); + f2fs_update_inode(inode, &folio->page); + folio_unlock(folio); iput(inode); return true; @@ -2061,7 +2061,7 @@ continue_unlock: } /* flush dirty inode */ - if (IS_INODE(&folio->page) && flush_dirty_inode(&folio->page)) + if (IS_INODE(&folio->page) && flush_dirty_inode(folio)) goto lock_node; write_node: f2fs_folio_wait_writeback(folio, NODE, true, true);