[f2fs-dev] [PATCH 059/153] f2fs: Use a folio in f2fs_xattr_fiemap()

[Matthew Wilcox (Oracle)]

Remove four hidden calls to compound_head().

Signed-off-by: Matthew Wilcox (Oracle) <wi...@infradead.org>
---
 fs/f2fs/data.c | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
index 09b440e1dd12..af0106e4f184 100644
--- a/fs/f2fs/data.c
+++ b/fs/f2fs/data.c
@@ -1826,7 +1826,6 @@ static int f2fs_xattr_fiemap(struct inode *inode,
                                struct fiemap_extent_info *fieinfo)
 {
        struct f2fs_sb_info *sbi = F2FS_I_SB(inode);
-       struct page *page;
        struct node_info ni;
        __u64 phys = 0, len;
        __u32 flags;
@@ -1835,15 +1834,15 @@ static int f2fs_xattr_fiemap(struct inode *inode,
 
        if (f2fs_has_inline_xattr(inode)) {
                int offset;
+               struct folio *folio = f2fs_grab_cache_folio(NODE_MAPPING(sbi),
+                               inode->i_ino, false);
 
-               page = f2fs_grab_cache_page(NODE_MAPPING(sbi),
-                                               inode->i_ino, false);
-               if (!page)
-                       return -ENOMEM;
+               if (IS_ERR(folio))
+                       return PTR_ERR(folio);
 
                err = f2fs_get_node_info(sbi, inode->i_ino, &ni, false);
                if (err) {
-                       f2fs_put_page(page, 1);
+                       f2fs_folio_put(folio, true);
                        return err;
                }
 
@@ -1855,7 +1854,7 @@ static int f2fs_xattr_fiemap(struct inode *inode,
                phys += offset;
                len = inline_xattr_size(inode);
 
-               f2fs_put_page(page, 1);
+               f2fs_folio_put(folio, true);
 
                flags = FIEMAP_EXTENT_DATA_INLINE | FIEMAP_EXTENT_NOT_ALIGNED;
 
@@ -1869,20 +1868,22 @@ static int f2fs_xattr_fiemap(struct inode *inode,
        }
 
        if (xnid) {
-               page = f2fs_grab_cache_page(NODE_MAPPING(sbi), xnid, false);
-               if (!page)
-                       return -ENOMEM;
+               struct folio *folio = f2fs_grab_cache_folio(NODE_MAPPING(sbi),
+                               xnid, false);
+
+               if (IS_ERR(folio))
+                       return PTR_ERR(folio);
 
                err = f2fs_get_node_info(sbi, xnid, &ni, false);
                if (err) {
-                       f2fs_put_page(page, 1);
+                       f2fs_folio_put(folio, true);
                        return err;
                }
 
                phys = F2FS_BLK_TO_BYTES(ni.blk_addr);
                len = inode->i_sb->s_blocksize;
 
-               f2fs_put_page(page, 1);
+               f2fs_folio_put(folio, true);
 
                flags = FIEMAP_EXTENT_LAST;
        }
-- 
2.47.2



_______________________________________________
Linux-f2fs-devel mailing list
Linux-f2fs-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel