f2fs: Pass a folio to inline_xattr_addr()

All callers now have a folio, so pass it in.

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/f2fs.h b/fs/f2fs/f2fs.h
index 48dee2817e43763dbedd16f2103a8f323e3f9440..ba6e138a2700ccd49df12e79b05763c000841553 100644 (file)
--- a/fs/f2fs/f2fs.h
+++ b/fs/f2fs/f2fs.h
@@ -3348,9 +3348,9 @@ static inline unsigned int addrs_per_page(struct inode *inode,
        return addrs;
 }
 
-static inline void *inline_xattr_addr(struct inode *inode, struct page *page)
+static inline void *inline_xattr_addr(struct inode *inode, struct folio *folio)
 {
-       struct f2fs_inode *ri = F2FS_INODE(page);
+       struct f2fs_inode *ri = F2FS_INODE(&folio->page);
 
        return (void *)&(ri->i_addr[DEF_ADDRS_PER_INODE -
                                        get_inline_xattr_addrs(inode)]);

diff --git a/fs/f2fs/node.c b/fs/f2fs/node.c
index 2b989135defe36d136e7f21a4905cf969bb718c8..8d000fd4e63a9754b6261fbf81f92d91bfb9ab55 100644 (file)
--- a/fs/f2fs/node.c
+++ b/fs/f2fs/node.c
@@ -2736,8 +2736,8 @@ int f2fs_recover_inline_xattr(struct inode *inode, struct folio *folio)
                goto update_inode;
        }
 
-       dst_addr = inline_xattr_addr(inode, &ifolio->page);
-       src_addr = inline_xattr_addr(inode, &folio->page);
+       dst_addr = inline_xattr_addr(inode, ifolio);
+       src_addr = inline_xattr_addr(inode, folio);
        inline_size = inline_xattr_size(inode);
 
        f2fs_folio_wait_writeback(ifolio, NODE, true, true);

diff --git a/fs/f2fs/xattr.c b/fs/f2fs/xattr.c
index c07b3d7c45fa543134b51bed77ee4e8abc28428d..58632a2b66136c239587fea03bd650e2dd0d2311 100644 (file)
--- a/fs/f2fs/xattr.c
+++ b/fs/f2fs/xattr.c
@@ -280,13 +280,13 @@ static int read_inline_xattr(struct inode *inode, struct folio *ifolio,
        void *inline_addr;
 
        if (ifolio) {
-               inline_addr = inline_xattr_addr(inode, &ifolio->page);
+               inline_addr = inline_xattr_addr(inode, ifolio);
        } else {
                folio = f2fs_get_inode_folio(sbi, inode->i_ino);
                if (IS_ERR(folio))
                        return PTR_ERR(folio);
 
-               inline_addr = inline_xattr_addr(inode, &folio->page);
+               inline_addr = inline_xattr_addr(inode, folio);
        }
        memcpy(txattr_addr, inline_addr, inline_size);
        f2fs_folio_put(folio, true);
@@ -447,14 +447,14 @@ static inline int write_all_xattrs(struct inode *inode, __u32 hsize,
        /* write to inline xattr */
        if (inline_size) {
                if (ifolio) {
-                       inline_addr = inline_xattr_addr(inode, &ifolio->page);
+                       inline_addr = inline_xattr_addr(inode, ifolio);
                } else {
                        in_folio = f2fs_get_inode_folio(sbi, inode->i_ino);
                        if (IS_ERR(in_folio)) {
                                f2fs_alloc_nid_failed(sbi, new_nid);
                                return PTR_ERR(in_folio);
                        }
-                       inline_addr = inline_xattr_addr(inode, &in_folio->page);
+                       inline_addr = inline_xattr_addr(inode, in_folio);
                }
 
                f2fs_folio_wait_writeback(ifolio ? ifolio : in_folio,