1 files changed, 7 insertions, 8 deletions

diff --git a/fs/f2fs/node.c b/fs/f2fs/node.c
index 093d7991b7ed..151045f3e7b7 100644
--- a/fs/f2fs/node.c
+++ b/fs/f2fs/node.c
@@ -1557,26 +1557,25 @@ void recover_inline_xattr(struct inode *inode, struct page *page)
         struct page *ipage;
         struct f2fs_inode *ri;
 
-        if (!f2fs_has_inline_xattr(inode))
-                return;
-
         if (!IS_INODE(page))
                 return;
 
-        ri = F2FS_INODE(page);
-        if (!(ri->i_inline & F2FS_INLINE_XATTR))
-                return;
-
         ipage = get_node_page(sbi, inode->i_ino);
         f2fs_bug_on(IS_ERR(ipage));
 
+        ri = F2FS_INODE(page);
+        if (!(ri->i_inline & F2FS_INLINE_XATTR)) {
+                clear_inode_flag(F2FS_I(inode), FI_INLINE_XATTR);
+                goto update_inode;
+        }
+
         dst_addr = inline_xattr_addr(ipage);
         src_addr = inline_xattr_addr(page);
         inline_size = inline_xattr_size(inode);
 
         f2fs_wait_on_page_writeback(ipage, NODE);
         memcpy(dst_addr, src_addr, inline_size);
-
+update_inode:
         update_inode(inode, ipage);
         f2fs_put_page(ipage, 1);
 }