commit 2a83ad1ac78b987352ddbabd0d5f944114910638
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Thu Sep 30 23:09:55 2021 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Thu Sep 30 23:09:55 2021 +0000
tree a9f42f5fec12b5124ed530b3e83bb5e1ff33fa24
parent 7f3b37ab9f8ff4bc8e26b0112c5d7e824afe5b96
parent 5bd01dc59125f0accab98f1b9d2f2243a41540b5

Snap for 7783058 from 5bd01dc59125f0accab98f1b9d2f2243a41540b5 to sc-v2-release

Change-Id: I1d40bc1a963c4f028831708fa3fcd52b0ab44ccc

fsck/mount.c

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 @@
 		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 @@
 			update_superblock(sbi->raw_super, SB_MASK(sb_addr));
 		}
 out:
+#endif
 		print_sb_state(sbi->raw_super);
 		return 0;
 	}