Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

f2fs: Pass a folio to f2fs_update_inode()

All callers now have a folio, so pass it in. Remove two 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>

authored by

Matthew Wilcox (Oracle) and committed by
Jaegeuk Kim
f9237928 a6d26d5c

+15 -15
+2 -2
fs/f2fs/dir.c
··· 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 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 }
+1 -1
fs/f2fs/f2fs.h
··· 3616 3616 struct inode *f2fs_iget(struct super_block *sb, unsigned long ino); 3617 3617 struct inode *f2fs_iget_retry(struct super_block *sb, unsigned long ino); 3618 3618 int f2fs_try_to_free_nats(struct f2fs_sb_info *sbi, int nr_shrink); 3619 - void f2fs_update_inode(struct inode *inode, struct page *node_page); 3619 + void f2fs_update_inode(struct inode *inode, struct folio *node_folio); 3620 3620 void f2fs_update_inode_page(struct inode *inode); 3621 3621 int f2fs_write_inode(struct inode *inode, struct writeback_control *wbc); 3622 3622 void f2fs_evict_inode(struct inode *inode);
+1 -1
fs/f2fs/inline.c
··· 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 }
+8 -8
fs/f2fs/inode.c
··· 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 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 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
+3 -3
fs/f2fs/node.c
··· 1870 1870 if (IS_INODE(&folio->page)) { 1871 1871 if (is_inode_flag_set(inode, 1872 1872 FI_DIRTY_INODE)) 1873 - f2fs_update_inode(inode, &folio->page); 1873 + f2fs_update_inode(inode, folio); 1874 1874 set_dentry_mark(&folio->page, 1875 1875 f2fs_need_dentry_mark(sbi, ino)); 1876 1876 } ··· 1955 1955 if (!inode) 1956 1956 return false; 1957 1957 1958 - f2fs_update_inode(inode, &folio->page); 1958 + f2fs_update_inode(inode, folio); 1959 1959 folio_unlock(folio); 1960 1960 1961 1961 iput(inode); ··· 2743 2743 f2fs_folio_wait_writeback(ifolio, NODE, true, true); 2744 2744 memcpy(dst_addr, src_addr, inline_size); 2745 2745 update_inode: 2746 - f2fs_update_inode(inode, &ifolio->page); 2746 + f2fs_update_inode(inode, ifolio); 2747 2747 f2fs_folio_put(ifolio, true); 2748 2748 return 0; 2749 2749 }