Commit 86d7d57a authored Dec 12, 2023 by Zhiguo Niu Committed by Jaegeuk Kim Dec 15, 2023

f2fs: fix to check return value of f2fs_recover_xattr_data



Should check return value of f2fs_recover_xattr_data in
__f2fs_setxattr rather than doing invalid retry if error happen.

Also just do set_page_dirty in f2fs_recover_xattr_data when
page is changed really.

Fixes: 50a472bb ("f2fs: do not return EFSCORRUPTED, but try to run online repair")
Signed-off-by: Zhiguo Niu <zhiguo.niu@unisoc.com>
Reviewed-by: Chao Yu <chao@kernel.org>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>

parent 394e7f4d

fs/f2fs/node.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -2751,11 +2751,11 @@ int f2fs_recover_xattr_data(struct inode inode, struct page page)
		f2fs_update_inode_page(inode);

		/* 3: update and set xattr node page dirty */
		if (page)
		if (page) {
		memcpy(F2FS_NODE(xpage), F2FS_NODE(page),
		VALID_XATTR_BLOCK_SIZE);

		set_page_dirty(xpage);
		}
		f2fs_put_page(xpage, 1);

		return 0;

fs/f2fs/xattr.c

+7 −4

Original line number	Diff line number	Diff line
		@@ -660,12 +660,15 @@ static int __f2fs_setxattr(struct inode *inode, int index,
		here = __find_xattr(base_addr, last_base_addr, NULL, index, len, name);
		if (!here) {
		if (!F2FS_I(inode)->i_xattr_nid) {
		error = f2fs_recover_xattr_data(inode, NULL);
		f2fs_notice(F2FS_I_SB(inode),
		"recover xattr in inode (%lu)", inode->i_ino);
		f2fs_recover_xattr_data(inode, NULL);
		"recover xattr in inode (%lu), error(%d)",
		inode->i_ino, error);
		if (!error) {
		kfree(base_addr);
		goto retry;
		}
		}
		f2fs_err(F2FS_I_SB(inode), "set inode (%lu) has corrupted xattr",
		inode->i_ino);
		set_sbi_flag(F2FS_I_SB(inode), SBI_NEED_FSCK);