From 463d65fb35cb7e11d33c7dc0c23358e0adf4a314 Mon Sep 17 00:00:00 2001 From: Jaegeuk Kim Date: Wed, 19 Dec 2012 16:09:19 +0900 Subject: [PATCH] --- yaml --- r: 348150 b: refs/heads/master c: 30f0c75858c46a0273ccb838de401b1f5fdebe6f h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/f2fs/super.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 668963c74adf..64d28000fcd5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 398b1ac5a57219823f942a8d3665b27ab99354de +refs/heads/master: 30f0c75858c46a0273ccb838de401b1f5fdebe6f diff --git a/trunk/fs/f2fs/super.c b/trunk/fs/f2fs/super.c index f4d9e03723db..50240d28ca24 100644 --- a/trunk/fs/f2fs/super.c +++ b/trunk/fs/f2fs/super.c @@ -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 */