f2fs: Pass a folio to f2fs_update_inode()

Matthew Wilcox (Oracle) · Jaegeuk Kim · commit f92379289f0c · 2025-04-28T15:26:47.000Z
All callers now have a folio, so pass it in.  Remove two calls to
compound_head().

Signed-off-by: Matthew Wilcox (Oracle) &lt;willy@infradead.org&gt;
Reviewed-by: Chao Yu &lt;chao@kernel.org&gt;
Signed-off-by: Jaegeuk Kim &lt;jaegeuk@kernel.org&gt;
diff --git a/fs/f2fs/dir.c b/fs/f2fs/dir.c
@@ -579,7 +579,7 @@ struct folio *f2fs_init_inode_metadata(struct inode *inode, struct inode *dir,
 
 put_error:
 	clear_nlink(inode);
-	f2fs_update_inode(inode, &folio->page);
+	f2fs_update_inode(inode, folio);
 	f2fs_folio_put(folio, true);
 	return ERR_PTR(err);
 }
@@ -738,7 +738,7 @@ int f2fs_add_regular_entry(struct inode *dir, const struct f2fs_filename *fname,
 
 		/* synchronize inode page's data from inode cache */
 		if (is_inode_flag_set(inode, FI_NEW_INODE))
-			f2fs_update_inode(inode, &folio->page);
+			f2fs_update_inode(inode, folio);
 
 		f2fs_folio_put(folio, true);
 	}
diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
@@ -3616,7 +3616,7 @@ void f2fs_inode_chksum_set(struct f2fs_sb_info *sbi, struct page *page);
 struct inode *f2fs_iget(struct super_block *sb, unsigned long ino);
 struct inode *f2fs_iget_retry(struct super_block *sb, unsigned long ino);
 int f2fs_try_to_free_nats(struct f2fs_sb_info *sbi, int nr_shrink);
-void f2fs_update_inode(struct inode *inode, struct page *node_page);
+void f2fs_update_inode(struct inode *inode, struct folio *node_folio);
 void f2fs_update_inode_page(struct inode *inode);
 int f2fs_write_inode(struct inode *inode, struct writeback_control *wbc);
 void f2fs_evict_inode(struct inode *inode);
diff --git a/fs/f2fs/inline.c b/fs/f2fs/inline.c
@@ -683,7 +683,7 @@ int f2fs_add_inline_entry(struct inode *dir, const struct f2fs_filename *fname,
 
 		/* synchronize inode page's data from inode cache */
 		if (is_inode_flag_set(inode, FI_NEW_INODE))
-			f2fs_update_inode(inode, &folio->page);
+			f2fs_update_inode(inode, folio);
 
 		f2fs_folio_put(folio, true);
 	}
diff --git a/fs/f2fs/inode.c b/fs/f2fs/inode.c
@@ -659,18 +659,18 @@ struct inode *f2fs_iget_retry(struct super_block *sb, unsigned long ino)
 	return inode;
 }
 
-void f2fs_update_inode(struct inode *inode, struct page *node_page)
+void f2fs_update_inode(struct inode *inode, struct folio *node_folio)
 {
 	struct f2fs_inode_info *fi = F2FS_I(inode);
 	struct f2fs_inode *ri;
 	struct extent_tree *et = fi->extent_tree[EX_READ];
 
-	f2fs_wait_on_page_writeback(node_page, NODE, true, true);
-	set_page_dirty(node_page);
+	f2fs_folio_wait_writeback(node_folio, NODE, true, true);
+	folio_mark_dirty(node_folio);
 
 	f2fs_inode_synced(inode);
 
-	ri = F2FS_INODE(node_page);
+	ri = F2FS_INODE(&node_folio->page);
 
 	ri->i_mode = cpu_to_le16(inode->i_mode);
 	ri->i_advise = fi->i_advise;
@@ -745,15 +745,15 @@ void f2fs_update_inode(struct inode *inode, struct page *node_page)
 		}
 	}
 
-	__set_inode_rdev(inode, node_page);
+	__set_inode_rdev(inode, &node_folio->page);
 
 	/* deleted inode */
 	if (inode->i_nlink == 0)
-		clear_page_private_inline(node_page);
+		clear_page_private_inline(&node_folio->page);
 
 	init_idisk_time(inode);
 #ifdef CONFIG_F2FS_CHECK_FS
-	f2fs_inode_chksum_set(F2FS_I_SB(inode), node_page);
+	f2fs_inode_chksum_set(F2FS_I_SB(inode), &node_folio->page);
 #endif
 }
 
@@ -780,7 +780,7 @@ void f2fs_update_inode_page(struct inode *inode)
 		f2fs_stop_checkpoint(sbi, false, STOP_CP_REASON_UPDATE_INODE);
 		return;
 	}
-	f2fs_update_inode(inode, &node_folio->page);
+	f2fs_update_inode(inode, node_folio);
 	f2fs_folio_put(node_folio, true);
 }
 
diff --git a/fs/f2fs/node.c b/fs/f2fs/node.c
@@ -1870,7 +1870,7 @@ int f2fs_fsync_node_pages(struct f2fs_sb_info *sbi, struct inode *inode,
 				if (IS_INODE(&folio->page)) {
 					if (is_inode_flag_set(inode,
 								FI_DIRTY_INODE))
-						f2fs_update_inode(inode, &folio->page);
+						f2fs_update_inode(inode, folio);
 					set_dentry_mark(&folio->page,
 						f2fs_need_dentry_mark(sbi, ino));
 				}
@@ -1955,7 +1955,7 @@ static bool flush_dirty_inode(struct folio *folio)
 	if (!inode)
 		return false;
 
-	f2fs_update_inode(inode, &folio->page);
+	f2fs_update_inode(inode, folio);
 	folio_unlock(folio);
 
 	iput(inode);
@@ -2743,7 +2743,7 @@ int f2fs_recover_inline_xattr(struct inode *inode, struct folio *folio)
 	f2fs_folio_wait_writeback(ifolio, NODE, true, true);
 	memcpy(dst_addr, src_addr, inline_size);
 update_inode:
-	f2fs_update_inode(inode, &ifolio->page);
+	f2fs_update_inode(inode, ifolio);
 	f2fs_folio_put(ifolio, true);
 	return 0;
 }

Original file line number	Diff line number	Diff line change
`@@ -579,7 +579,7 @@ struct folio f2fs_init_inode_metadata(struct inode inode, struct inode *dir,`
`579`	`579`
`580`	`580`	`put_error:`
`581`	`581`	`clear_nlink(inode);`
`582`		`- f2fs_update_inode(inode, &folio->page);`
	`582`	`+ f2fs_update_inode(inode, folio);`
`583`	`583`	`f2fs_folio_put(folio, true);`
`584`	`584`	`return ERR_PTR(err);`
`585`	`585`	`}`
`@@ -738,7 +738,7 @@ int f2fs_add_regular_entry(struct inode dir, const struct f2fs_filename fname,`
`738`	`738`
`739`	`739`	`/* synchronize inode page's data from inode cache */`
`740`	`740`	`if (is_inode_flag_set(inode, FI_NEW_INODE))`
`741`		`- f2fs_update_inode(inode, &folio->page);`
	`741`	`+ f2fs_update_inode(inode, folio);`
`742`	`742`
`743`	`743`	`f2fs_folio_put(folio, true);`
`744`	`744`	`}`
Original file line number	Diff line number	Diff line change
`@@ -683,7 +683,7 @@ int f2fs_add_inline_entry(struct inode dir, const struct f2fs_filename fname,`
`683`	`683`
`684`	`684`	`/* synchronize inode page's data from inode cache */`
`685`	`685`	`if (is_inode_flag_set(inode, FI_NEW_INODE))`
`686`		`- f2fs_update_inode(inode, &folio->page);`
	`686`	`+ f2fs_update_inode(inode, folio);`
`687`	`687`
`688`	`688`	`f2fs_folio_put(folio, true);`
`689`	`689`	`}`
Original file line number	Diff line number	Diff line change
`@@ -659,18 +659,18 @@ struct inode f2fs_iget_retry(struct super_block sb, unsigned long ino)`
`659`	`659`	`return inode;`
`660`	`660`	`}`
`661`	`661`
`662`		`-void f2fs_update_inode(struct inode inode, struct page node_page)`
	`662`	`+void f2fs_update_inode(struct inode inode, struct folio node_folio)`
`663`	`663`	`{`
`664`	`664`	`struct f2fs_inode_info *fi = F2FS_I(inode);`
`665`	`665`	`struct f2fs_inode *ri;`
`666`	`666`	`struct extent_tree *et = fi->extent_tree[EX_READ];`
`667`	`667`
`668`		`- f2fs_wait_on_page_writeback(node_page, NODE, true, true);`
`669`		`- set_page_dirty(node_page);`
	`668`	`+ f2fs_folio_wait_writeback(node_folio, NODE, true, true);`
	`669`	`+ folio_mark_dirty(node_folio);`
`670`	`670`
`671`	`671`	`f2fs_inode_synced(inode);`
`672`	`672`
`673`		`- ri = F2FS_INODE(node_page);`
	`673`	`+ ri = F2FS_INODE(&node_folio->page);`
`674`	`674`
`675`	`675`	`ri->i_mode = cpu_to_le16(inode->i_mode);`
`676`	`676`	`ri->i_advise = fi->i_advise;`
`@@ -745,15 +745,15 @@ void f2fs_update_inode(struct inode inode, struct page node_page)`
`745`	`745`	`}`
`746`	`746`	`}`
`747`	`747`
`748`		`- __set_inode_rdev(inode, node_page);`
	`748`	`+ __set_inode_rdev(inode, &node_folio->page);`
`749`	`749`
`750`	`750`	`/* deleted inode */`
`751`	`751`	`if (inode->i_nlink == 0)`
`752`		`- clear_page_private_inline(node_page);`
	`752`	`+ clear_page_private_inline(&node_folio->page);`
`753`	`753`
`754`	`754`	`init_idisk_time(inode);`
`755`	`755`	`#ifdef CONFIG_F2FS_CHECK_FS`
`756`		`- f2fs_inode_chksum_set(F2FS_I_SB(inode), node_page);`
	`756`	`+ f2fs_inode_chksum_set(F2FS_I_SB(inode), &node_folio->page);`
`757`	`757`	`#endif`
`758`	`758`	`}`
`759`	`759`
`@@ -780,7 +780,7 @@ void f2fs_update_inode_page(struct inode *inode)`
`780`	`780`	`f2fs_stop_checkpoint(sbi, false, STOP_CP_REASON_UPDATE_INODE);`
`781`	`781`	`return;`
`782`	`782`	`}`
`783`		`- f2fs_update_inode(inode, &node_folio->page);`
	`783`	`+ f2fs_update_inode(inode, node_folio);`
`784`	`784`	`f2fs_folio_put(node_folio, true);`
`785`	`785`	`}`
`786`	`786`