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

Commit 91bcfd8d authored by Eric Biggers's avatar Eric Biggers
Browse files

fs_mgr: fix checking for casefold feature already enabled 

EXT4_FEATURE_INCOMPAT_CASEFOLD is a flag in s_feature_incompat, not in
s_feature_ro_compat.

Bug: 138322712
Test: Treehugger
Change-Id: I07bb1d2b818d423196d8ceebda8900a8adbb19e9
parent 8ef1e1b5

fs_mgr/fs_mgr.cpp

+1 −2
Original line number Diff line number Diff line
@@ -512,8 +512,7 @@ static void tune_verity(const std::string& blk_device, const FstabEntry& entry, 
// Enable casefold if needed.

static void tune_casefold(const std::string& blk_device, const struct ext4_super_block* sb,

                          int* fs_stat) {

    bool has_casefold =

            (sb->s_feature_ro_compat & cpu_to_le32(EXT4_FEATURE_INCOMPAT_CASEFOLD)) != 0;

    bool has_casefold = (sb->s_feature_incompat & cpu_to_le32(EXT4_FEATURE_INCOMPAT_CASEFOLD)) != 0;

    bool wants_casefold = android::base::GetBoolProperty("ro.emulated_storage.casefold", false);



    if (!wants_casefold || has_casefold) return;