f2fs: Use a folio in __find_data_block()

Remove a call to f2fs_get_inode_page().

Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Reviewed-by: Chao Yu <chao@kernel.org>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>

diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
index 27005785f56d474ac6de67fa39d42fd7c0113eb0..e7bb105c889de122744cb0f314a9a777401436b6 100644 (file)
--- a/fs/f2fs/data.c
+++ b/fs/f2fs/data.c
@@ -3438,14 +3438,14 @@ static int __find_data_block(struct inode *inode, pgoff_t index,
                                block_t *blk_addr)
 {
        struct dnode_of_data dn;
-       struct page *ipage;
+       struct folio *ifolio;
        int err = 0;
 
-       ipage = f2fs_get_inode_page(F2FS_I_SB(inode), inode->i_ino);
-       if (IS_ERR(ipage))
-               return PTR_ERR(ipage);
+       ifolio = f2fs_get_inode_folio(F2FS_I_SB(inode), inode->i_ino);
+       if (IS_ERR(ifolio))
+               return PTR_ERR(ifolio);
 
-       set_new_dnode(&dn, inode, ipage, ipage, 0);
+       set_new_dnode(&dn, inode, &ifolio->page, &ifolio->page, 0);
 
        if (!f2fs_lookup_read_extent_cache_block(inode, index,
                                                 &dn.data_blkaddr)) {
@@ -3466,17 +3466,17 @@ static int __reserve_data_block(struct inode *inode, pgoff_t index,
 {
        struct f2fs_sb_info *sbi = F2FS_I_SB(inode);
        struct dnode_of_data dn;
-       struct page *ipage;
+       struct folio *ifolio;
        int err = 0;
 
        f2fs_map_lock(sbi, F2FS_GET_BLOCK_PRE_AIO);
 
-       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_lookup_read_extent_cache_block(dn.inode, index,
                                                &dn.data_blkaddr))