Merge tag 'for-linus-20160527' of git://git.infradead.org/linux-mtd

[cascardo/linux.git] / fs / f2fs / inode.c

diff --git a/fs/f2fs/inode.c b/fs/f2fs/inode.c
index cb269c4..2e68ada 100644 (file)
--- a/fs/f2fs/inode.c
+++ b/fs/f2fs/inode.c
@@ -283,7 +283,7 @@ retry:
                        cond_resched();
                        goto retry;
                } else if (err != -ENOENT) {
-                       f2fs_stop_checkpoint(sbi);
+                       f2fs_stop_checkpoint(sbi, false);
                }
                return 0;
        }
@@ -344,7 +344,7 @@ void f2fs_evict_inode(struct inode *inode)
        sb_start_intwrite(inode->i_sb);
        set_inode_flag(fi, FI_NO_ALLOC);
        i_size_write(inode, 0);
-
+retry:
        if (F2FS_HAS_BLOCKS(inode))
                err = f2fs_truncate(inode, true);
 
@@ -354,6 +354,12 @@ void f2fs_evict_inode(struct inode *inode)
                f2fs_unlock_op(sbi);
        }
 
+       /* give more chances, if ENOMEM case */
+       if (err == -ENOMEM) {
+               err = 0;
+               goto retry;
+       }
+
        sb_end_intwrite(inode->i_sb);
 no_delete:
        stat_dec_inline_xattr(inode);
@@ -368,26 +374,11 @@ no_delete:
        if (is_inode_flag_set(fi, FI_UPDATE_WRITE))
                add_ino_entry(sbi, inode->i_ino, UPDATE_INO);
        if (is_inode_flag_set(fi, FI_FREE_NID)) {
-               if (err && err != -ENOENT)
-                       alloc_nid_done(sbi, inode->i_ino);
-               else
-                       alloc_nid_failed(sbi, inode->i_ino);
+               alloc_nid_failed(sbi, inode->i_ino);
                clear_inode_flag(fi, FI_FREE_NID);
        }
-
-       if (err && err != -ENOENT) {
-               if (!exist_written_data(sbi, inode->i_ino, ORPHAN_INO)) {
-                       /*
-                        * get here because we failed to release resource
-                        * of inode previously, reminder our user to run fsck
-                        * for fixing.
-                        */
-                       set_sbi_flag(sbi, SBI_NEED_FSCK);
-                       f2fs_msg(sbi->sb, KERN_WARNING,
-                               "inode (ino:%lu) resource leak, run fsck "
-                               "to fix this issue!", inode->i_ino);
-               }
-       }
+       f2fs_bug_on(sbi, err &&
+               !exist_written_data(sbi, inode->i_ino, ORPHAN_INO));
 out_clear:
        fscrypt_put_encryption_info(inode, NULL);
        clear_inode(inode);
@@ -397,37 +388,32 @@ out_clear:
 void handle_failed_inode(struct inode *inode)
 {
        struct f2fs_sb_info *sbi = F2FS_I_SB(inode);
-       int err = 0;
+       struct node_info ni;
 
-       clear_nlink(inode);
-       make_bad_inode(inode);
+       /* don't make bad inode, since it becomes a regular file. */
        unlock_new_inode(inode);
 
-       i_size_write(inode, 0);
-       if (F2FS_HAS_BLOCKS(inode))
-               err = f2fs_truncate(inode, false);
-
-       if (!err)
-               err = remove_inode_page(inode);
-
        /*
-        * if we skip truncate_node in remove_inode_page bacause we failed
-        * before, it's better to find another way to release resource of
-        * this inode (e.g. valid block count, node block or nid). Here we
-        * choose to add this inode to orphan list, so that we can call iput
-        * for releasing in orphan recovery flow.
-        *
         * Note: we should add inode to orphan list before f2fs_unlock_op()
         * so we can prevent losing this orphan when encoutering checkpoint
         * and following suddenly power-off.
         */
-       if (err && err != -ENOENT) {
-               err = acquire_orphan_inode(sbi);
-               if (!err)
+       get_node_info(sbi, inode->i_ino, &ni);
+
+       if (ni.blk_addr != NULL_ADDR) {
+               int err = acquire_orphan_inode(sbi);
+               if (err) {
+                       set_sbi_flag(sbi, SBI_NEED_FSCK);
+                       f2fs_msg(sbi->sb, KERN_WARNING,
+                               "Too many orphan inodes, run fsck to fix.");
+               } else {
                        add_orphan_inode(sbi, inode->i_ino);
+               }
+               alloc_nid_done(sbi, inode->i_ino);
+       } else {
+               set_inode_flag(F2FS_I(inode), FI_FREE_NID);
        }
 
-       set_inode_flag(F2FS_I(inode), FI_FREE_NID);
        f2fs_unlock_op(sbi);
 
        /* iput will drop the inode object */