mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-27 12:57:53 +00:00
f2fs: fix to check return value of f2fs_recover_xattr_data
[ Upstream commit86d7d57a3f
] 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:50a472bbc7
("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> Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
parent
0c5d08b1c9
commit
cf8a10d41f
2 changed files with 10 additions and 7 deletions
|
@ -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);
|
||||
set_page_dirty(xpage);
|
||||
}
|
||||
f2fs_put_page(xpage, 1);
|
||||
|
||||
return 0;
|
||||
|
|
|
@ -660,11 +660,14 @@ 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);
|
||||
kfree(base_addr);
|
||||
goto retry;
|
||||
"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);
|
||||
|
|
Loading…
Reference in a new issue