Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1c438c1b authored by Keun-young Park's avatar Keun-young Park
Browse files

use s_max_mnt_count to detect mke2fs generated partition 

- Old tool will set it to 10 while mke2fs will set it to -1.
- For now, only tag it.
- TODO: possibly add different policy per image tool version.

bug: 32246772
Test: check dmesg after reboot

(cherry picked from commit 95e233f9)

Change-Id: Icd4758e240009d7b37df2d8a0e2a20d5ddbe4906
parent 57d4c595

fs_mgr/fs_mgr.cpp

+4 −1
Original line number Original line Diff line number Diff line
@@ -283,7 +283,10 @@ static int do_quota_with_shutdown_check(char *blk_device, char *fs_type, 
                    return force_check;

                    return force_check;

                }

                }

                *fs_stat |= FS_STAT_IS_EXT4;

                *fs_stat |= FS_STAT_IS_EXT4;

                //TODO check if it is new version or not

                LINFO << "superblock s_max_mnt_count:" << sb.s_max_mnt_count << "," << blk_device;

                if (sb.s_max_mnt_count == 0xffff) {  // -1 (int16) in ext2, but uint16 in ext4

                    *fs_stat |= FS_STAT_NEW_IMAGE_VERSION;

                }

                if ((sb.s_feature_incompat & EXT4_FEATURE_INCOMPAT_RECOVER) != 0 ||

                if ((sb.s_feature_incompat & EXT4_FEATURE_INCOMPAT_RECOVER) != 0 ||

                    (sb.s_state & EXT4_VALID_FS) == 0) {

                    (sb.s_state & EXT4_VALID_FS) == 0) {

                    LINFO << __FUNCTION__ << "(): was not clealy shutdown, state flag:"

                    LINFO << __FUNCTION__ << "(): was not clealy shutdown, state flag:"