diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-09-30 23:02:36 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-09-30 23:02:36 +0000 |
commit | 38d206f6e58be4b4d221a8b5f9979ac022ba991a (patch) | |
tree | a9f42f5fec12b5124ed530b3e83bb5e1ff33fa24 | |
parent | 318e30990b0661f49a9e43b568de5669972b2de2 (diff) | |
parent | 5bd01dc59125f0accab98f1b9d2f2243a41540b5 (diff) | |
download | f2fs-tools-android12L-d2-s1-release.tar.gz |
Snap for 7783058 from 5bd01dc59125f0accab98f1b9d2f2243a41540b5 to sc-d2-releaseandroid-12.1.0_r26android-12.1.0_r25android-12.1.0_r24android-12.1.0_r23android-12.1.0_r18android-12.1.0_r17android-12.1.0_r16android-12.1.0_r15android-12.1.0_r14android-12.1.0_r13android-12.1.0_r12android12L-d2-s8-releaseandroid12L-d2-s7-releaseandroid12L-d2-s6-releaseandroid12L-d2-s5-releaseandroid12L-d2-s4-releaseandroid12L-d2-s3-releaseandroid12L-d2-s2-releaseandroid12L-d2-s1-releaseandroid12L-d2-release
Change-Id: I3e0c4165e95fffc38ca76979691f681ce4bbe70d
-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; } |