From: Matthew Wilcox (Oracle) Date: Mon, 31 Mar 2025 20:11:45 +0000 (+0100) Subject: f2fs: Use a folio in prepare_write_begin X-Git-Url: http://git.monstr.eu/?a=commitdiff_plain;h=c68b0bcb29d6f5b3e2bc5ac2c873051c6ef4b4a4;p=linux-2.6-microblaze.git f2fs: Use a folio in prepare_write_begin Remove a call to f2fs_get_inode_page(). Signed-off-by: Matthew Wilcox (Oracle) Reviewed-by: Chao Yu Signed-off-by: Jaegeuk Kim --- diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c index f3eb131be212..27005785f56d 100644 --- a/fs/f2fs/data.c +++ b/fs/f2fs/data.c @@ -3353,7 +3353,7 @@ static int prepare_write_begin(struct f2fs_sb_info *sbi, struct inode *inode = folio->mapping->host; pgoff_t index = folio->index; struct dnode_of_data dn; - struct page *ipage; + struct folio *ifolio; bool locked = false; int flag = F2FS_GET_BLOCK_PRE_AIO; int err = 0; @@ -3378,20 +3378,20 @@ static int prepare_write_begin(struct f2fs_sb_info *sbi, restart: /* check inline_data */ - ipage = f2fs_get_inode_page(sbi, inode->i_ino); - if (IS_ERR(ipage)) { - err = PTR_ERR(ipage); + ifolio = f2fs_get_inode_folio(sbi, inode->i_ino); + if (IS_ERR(ifolio)) { + err = PTR_ERR(ifolio); goto unlock_out; } - set_new_dnode(&dn, inode, ipage, ipage, 0); + set_new_dnode(&dn, inode, &ifolio->page, &ifolio->page, 0); if (f2fs_has_inline_data(inode)) { if (pos + len <= MAX_INLINE_DATA(inode)) { - f2fs_do_read_inline_data(folio, ipage); + f2fs_do_read_inline_data(folio, &ifolio->page); set_inode_flag(inode, FI_DATA_EXIST); if (inode->i_nlink) - set_page_private_inline(ipage); + set_page_private_inline(&ifolio->page); goto out; } err = f2fs_convert_inline_page(&dn, folio_page(folio, 0));