f2fs: fix to check return value of f2fs_recover_xattr_data

[ Upstream commit 86d7d57a3f096c8349b32a0cd5f6f314e4416a6d ]

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: 50a472bbc79f ("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>

diff --git a/fs/f2fs/node.c b/fs/f2fs/node.c
index 8b30f11f37b4680fd7649aee5fb2ada6014e2179..9e00932770d8a8053314f2374917b28be32ea13e 100644 (file)
--- a/fs/f2fs/node.c
+++ b/fs/f2fs/node.c
@@ -2751,11 +2751,11 @@ recover_xnid:
        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;

diff --git a/fs/f2fs/xattr.c b/fs/f2fs/xattr.c
index e197657db36b17390a184fa8358d283be75aa518..e47cc917d1184250b403816286aea3854b2e58f8 100644 (file)
--- a/fs/f2fs/xattr.c
+++ b/fs/f2fs/xattr.c
@@ -660,11 +660,14 @@ retry:
        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);