]> rtime.felk.cvut.cz Git - linux-imx.git/commitdiff
f2fs: should recover orphan and fsync data
authorJaegeuk Kim <jaegeuk.kim@samsung.com>
Wed, 19 Dec 2012 07:09:19 +0000 (16:09 +0900)
committerJaegeuk Kim <jaegeuk.kim@samsung.com>
Wed, 26 Dec 2012 01:39:52 +0000 (10:39 +0900)
The recovery routine should do all the time regardless of normal umount action.

Signed-off-by: Jaegeuk Kim <jaegeuk.kim@samsung.com>
fs/f2fs/super.c

index f4d9e03723db19574e2266e3bd0359d090709c1f..50240d28ca240491a6502a2b2115861ea485e387 100644 (file)
@@ -528,8 +528,7 @@ static int f2fs_fill_super(struct super_block *sb, void *data, int silent)
 
        /* if there are nt orphan nodes free them */
        err = -EINVAL;
-       if (!is_set_ckpt_flags(F2FS_CKPT(sbi), CP_UMOUNT_FLAG) &&
-                               recover_orphan_inodes(sbi))
+       if (recover_orphan_inodes(sbi))
                goto free_node_inode;
 
        /* read root inode and dentry */
@@ -548,8 +547,7 @@ static int f2fs_fill_super(struct super_block *sb, void *data, int silent)
        }
 
        /* recover fsynced data */
-       if (!is_set_ckpt_flags(F2FS_CKPT(sbi), CP_UMOUNT_FLAG) &&
-                               !test_opt(sbi, DISABLE_ROLL_FORWARD))
+       if (!test_opt(sbi, DISABLE_ROLL_FORWARD))
                recover_fsync_data(sbi);
 
        /* After POR, we can run background GC thread */