diff options
| author | Daeho Jeong <daehojeong@google.com> | 2021-09-29 22:32:45 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-09-29 22:32:45 +0000 |
| commit | 5bd01dc59125f0accab98f1b9d2f2243a41540b5 (patch) | |
| tree | a9f42f5fec12b5124ed530b3e83bb5e1ff33fa24 | |
| parent | 4c428f18144c45c5080a1b86b3ee084fc92ee879 (diff) | |
| parent | 3b96ccbb7d9866728e4d1ce758d98844dc7e17b6 (diff) | |
| download | f2fs-tools-android12-qpr3-s6-release.tar.gz | |
f2fs-tools: fall back to the original version check when clock_gettime is not supported am: 3b96ccbb7dandroid-s-qpr3-beta-1android-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-12.1.0_r11android-12.1.0_r10android12L-devandroid12-qpr3-s7-releaseandroid12-qpr3-s6-releaseandroid12-qpr3-s5-releaseandroid12-qpr3-s4-releaseandroid12-qpr3-s3-releaseandroid12-qpr3-s2-releaseandroid12-qpr3-s1-releaseandroid12-qpr3-releaseandroid-s-qpr3-beta-1
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/f2fs-tools/+/15937663
Change-Id: I9262ca1e574b227c9fbd9e822392df61801aa8cd
| -rw-r--r-- | fsck/mount.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/fsck/mount.c b/fsck/mount.c index 3fb6a0d..5e805c7 100644 --- a/fsck/mount.c +++ b/fsck/mount.c @@ -980,6 +980,16 @@ int validate_super_block(struct f2fs_sb_info *sbi, enum SB_ADDR sb_addr) MSG(0, "Info: MKFS version\n \"%s\"\n", c.init_version); MSG(0, "Info: FSCK version\n from \"%s\"\n to \"%s\"\n", c.sb_version, c.version); +#if defined(__APPLE__) + if (!c.no_kernel_check && + memcmp(c.sb_version, c.version, VERSION_NAME_LEN)) { + c.auto_fix = 0; + c.fix_on = 1; + memcpy(sbi->raw_super->version, + c.version, VERSION_NAME_LEN); + update_superblock(sbi->raw_super, SB_MASK(sb_addr)); + } +#else if (!c.no_kernel_check) { struct timespec t; u32 prev_time, cur_time, time_diff; @@ -1012,6 +1022,7 @@ int validate_super_block(struct f2fs_sb_info *sbi, enum SB_ADDR sb_addr) update_superblock(sbi->raw_super, SB_MASK(sb_addr)); } out: +#endif print_sb_state(sbi->raw_super); return 0; } |