diff options
| author | Jaegeuk Kim <jaegeuk@kernel.org> | 2015-03-24 02:57:53 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-03-24 02:57:53 +0000 |
| commit | 4115784b9650a6b9bc7ff099e2bec80198f2482a (patch) | |
| tree | dff35ac10d9afb75b5f976b5c68a850a419e8228 | |
| parent | 69ff5a62777cb3e95d23020cc7d9622c88e4a173 (diff) | |
| parent | f3b55c8ff22bfd7bfb5588637d08804aca9ac148 (diff) | |
| download | f2fs-tools-4115784b9650a6b9bc7ff099e2bec80198f2482a.tar.gz | |
am f3b55c8f: fsck.f2fs: fix sit types seamlessly
* commit 'f3b55c8ff22bfd7bfb5588637d08804aca9ac148':
fsck.f2fs: fix sit types seamlessly
| -rw-r--r-- | fsck/fsck.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/fsck/fsck.c b/fsck/fsck.c index 09bb26f..a5f9adc 100644 --- a/fsck/fsck.c +++ b/fsck/fsck.c @@ -1023,6 +1023,7 @@ int fsck_verify(struct f2fs_sb_info *sbi) { unsigned int i = 0; int ret = 0; + int force = 0; u32 nr_unref_nid = 0; struct f2fs_fsck *fsck = F2FS_FSCK(sbi); struct hard_link_node *node = NULL; @@ -1129,14 +1130,9 @@ int fsck_verify(struct f2fs_sb_info *sbi) config.bug_on = 1; } - printf("[FSCK] SIT types "); - if (check_sit_types(sbi) == 0) { - printf(" [Ok..]\n"); - } else { - printf(" [Fail]\n"); - ret = EXIT_ERR_CODE; - config.bug_on = 1; - } + printf("[FSCK] fixing SIT types\n"); + if (check_sit_types(sbi) != 0) + force = 1; printf("[FSCK] other corrupted bugs "); if (config.bug_on == 0) { @@ -1147,7 +1143,7 @@ int fsck_verify(struct f2fs_sb_info *sbi) } /* fix global metadata */ - if (config.bug_on && config.fix_on) { + if (force || (config.bug_on && config.fix_on)) { fix_nat_entries(sbi); rewrite_sit_area_bitmap(sbi); fix_checkpoint(sbi); |