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

Commit 06f8bd9e authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "fs_mgr: fix checking for casefold feature already enabled" am: 154bd7e0 

Change-Id: I3c23d4bc78dca61397e4720dfe4752fcb570fef5
parents 5a04435a 154bd7e0

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;