1 files changed, 40 insertions, 4 deletions

diff --git a/fs/f2fs/inode.c b/fs/f2fs/inode.c
index 0deead4505e7..196cc7843aaf 100644
--- a/fs/f2fs/inode.c
+++ b/fs/f2fs/inode.c
@@ -67,12 +67,38 @@ static void __set_inode_rdev(struct inode *inode, struct f2fs_inode *ri)
         }
 }
 
+static int __recover_inline_status(struct inode *inode, struct page *ipage)
+{
+        void *inline_data = inline_data_addr(ipage);
+        struct f2fs_inode *ri;
+        void *zbuf;
+
+        zbuf = kzalloc(MAX_INLINE_DATA, GFP_NOFS);
+        if (!zbuf)
+                return -ENOMEM;
+
+        if (!memcmp(zbuf, inline_data, MAX_INLINE_DATA)) {
+                kfree(zbuf);
+                return 0;
+        }
+        kfree(zbuf);
+
+        f2fs_wait_on_page_writeback(ipage, NODE);
+        set_inode_flag(F2FS_I(inode), FI_DATA_EXIST);
+
+        ri = F2FS_INODE(ipage);
+        set_raw_inline(F2FS_I(inode), ri);
+        set_page_dirty(ipage);
+        return 0;
+}
+
 static int do_read_inode(struct inode *inode)
 {
         struct f2fs_sb_info *sbi = F2FS_I_SB(inode);
         struct f2fs_inode_info *fi = F2FS_I(inode);
         struct page *node_page;
         struct f2fs_inode *ri;
+        int err = 0;
 
         /* Check if ino is within scope */
         if (check_nid_range(sbi, inode->i_ino)) {
@@ -114,11 +140,19 @@ static int do_read_inode(struct inode *inode)
         get_extent_info(&fi->ext, ri->i_ext);
         get_inline_info(fi, ri);
 
+        /* check data exist */
+        if (f2fs_has_inline_data(inode) && !f2fs_exist_data(inode))
+                err = __recover_inline_status(inode, node_page);
+
         /* get rdev by using inline_info */
         __get_inode_rdev(inode, ri);
 
         f2fs_put_page(node_page, 1);
-        return 0;
+
+        stat_inc_inline_inode(inode);
+        stat_inc_inline_dir(inode);
+
+        return err;
 }
 
 struct inode *f2fs_iget(struct super_block *sb, unsigned long ino)
@@ -156,7 +190,7 @@ make_now:
                 inode->i_op = &f2fs_dir_inode_operations;
                 inode->i_fop = &f2fs_dir_operations;
                 inode->i_mapping->a_ops = &f2fs_dblock_aops;
-                mapping_set_gfp_mask(inode->i_mapping, GFP_F2FS_ZERO);
+                mapping_set_gfp_mask(inode->i_mapping, GFP_F2FS_HIGH_ZERO);
         } else if (S_ISLNK(inode->i_mode)) {
                 inode->i_op = &f2fs_symlink_inode_operations;
                 inode->i_mapping->a_ops = &f2fs_dblock_aops;
@@ -295,11 +329,12 @@ void f2fs_evict_inode(struct inode *inode)
 
         f2fs_lock_op(sbi);
         remove_inode_page(inode);
-        stat_dec_inline_inode(inode);
         f2fs_unlock_op(sbi);
 
         sb_end_intwrite(inode->i_sb);
 no_delete:
+        stat_dec_inline_dir(inode);
+        stat_dec_inline_inode(inode);
         invalidate_mapping_pages(NODE_MAPPING(sbi), inode->i_ino, inode->i_ino);
         if (xnid)
                 invalidate_mapping_pages(NODE_MAPPING(sbi), xnid, xnid);
@@ -325,8 +360,9 @@ void handle_failed_inode(struct inode *inode)
                 f2fs_truncate(inode);
 
         remove_inode_page(inode);
-        stat_dec_inline_inode(inode);
 
+        clear_inode_flag(F2FS_I(inode), FI_INLINE_DATA);
+        clear_inode_flag(F2FS_I(inode), FI_INLINE_DENTRY);
         alloc_nid_failed(sbi, inode->i_ino);
         f2fs_unlock_op(sbi);