mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-02-19 11:21:15 -05:00
f2fs: Pass a folio to read_inline_xattr()
Both callers 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>
This commit is contained in:
committed by
Jaegeuk Kim
parent
39d20727d8
commit
c8b1987486
@@ -271,7 +271,7 @@ static struct f2fs_xattr_entry *__find_inline_xattr(struct inode *inode,
|
||||
return entry;
|
||||
}
|
||||
|
||||
static int read_inline_xattr(struct inode *inode, struct page *ipage,
|
||||
static int read_inline_xattr(struct inode *inode, struct folio *ifolio,
|
||||
void *txattr_addr)
|
||||
{
|
||||
struct f2fs_sb_info *sbi = F2FS_I_SB(inode);
|
||||
@@ -279,8 +279,8 @@ static int read_inline_xattr(struct inode *inode, struct page *ipage,
|
||||
struct folio *folio = NULL;
|
||||
void *inline_addr;
|
||||
|
||||
if (ipage) {
|
||||
inline_addr = inline_xattr_addr(inode, ipage);
|
||||
if (ifolio) {
|
||||
inline_addr = inline_xattr_addr(inode, &ifolio->page);
|
||||
} else {
|
||||
folio = f2fs_get_inode_folio(sbi, inode->i_ino);
|
||||
if (IS_ERR(folio))
|
||||
@@ -338,7 +338,7 @@ static int lookup_all_xattrs(struct inode *inode, struct folio *ifolio,
|
||||
|
||||
/* read from inline xattr */
|
||||
if (inline_size) {
|
||||
err = read_inline_xattr(inode, &ifolio->page, txattr_addr);
|
||||
err = read_inline_xattr(inode, ifolio, txattr_addr);
|
||||
if (err)
|
||||
goto out;
|
||||
|
||||
@@ -402,7 +402,7 @@ static int read_all_xattrs(struct inode *inode, struct folio *ifolio,
|
||||
|
||||
/* read from inline xattr */
|
||||
if (inline_size) {
|
||||
err = read_inline_xattr(inode, &ifolio->page, txattr_addr);
|
||||
err = read_inline_xattr(inode, ifolio, txattr_addr);
|
||||
if (err)
|
||||
goto fail;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user