diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-09-30 01:03:09 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-09-30 01:03:09 +0000 |
commit | 734b3d65e92f3b9bfd0e87ca1ef315def9aaf8cc (patch) | |
tree | a9f42f5fec12b5124ed530b3e83bb5e1ff33fa24 | |
parent | 51a2a8d2bc016b2c90198a4ea8828a231c1c7132 (diff) | |
parent | 3b96ccbb7d9866728e4d1ce758d98844dc7e17b6 (diff) | |
download | f2fs-tools-android12-qpr1-release.tar.gz |
Snap for 7779705 from 3b96ccbb7d9866728e4d1ce758d98844dc7e17b6 to sc-qpr1-releaseandroid-12.0.0_r28android-12.0.0_r26android-12.0.0_r16android12-qpr1-release
Change-Id: I8400135a608e0c16d0151b9cad31cf31cd475b5e
-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; } |