From e0691a051f1138c5ac2adf0971c255035f797e8d Mon Sep 17 00:00:00 2001 From: "Matthew Wilcox (Oracle)" Date: Mon, 31 Mar 2025 21:12:19 +0100 Subject: [PATCH] f2fs: Pass a folio to inline_xattr_addr() All callers now have a folio, so pass it in. Signed-off-by: Matthew Wilcox (Oracle) Reviewed-by: Chao Yu Signed-off-by: Jaegeuk Kim --- fs/f2fs/f2fs.h | 4 ++-- fs/f2fs/node.c | 4 ++-- fs/f2fs/xattr.c | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h index 48dee2817e43..ba6e138a2700 100644 --- 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 2b989135defe..8d000fd4e63a 100644 --- 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 c07b3d7c45fa..58632a2b6613 100644 --- 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, -- 2.50.1