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

Commit 52ea5e96 authored by Paul Crowley's avatar Paul Crowley Committed by Automerger Merge Worker
Browse files

Merge "emmc_optimized means stable_inodes" into rvc-dev am: c05e7c02 am: 9d0ade6d 

Change-Id: I19d81e58bd0cc682013459bdd4f2929495af3eb0
parents b8d52306 9d0ade6d

fs_mgr/fs_mgr.cpp

+2 −1
Original line number Diff line number Diff line
@@ -454,7 +454,8 @@ static void tune_encrypt(const std::string& blk_device, const FstabEntry& entry, 
               << entry.encryption_options;

        return;

    }

    if ((options.flags & FSCRYPT_POLICY_FLAG_IV_INO_LBLK_64) != 0) {

    if ((options.flags &

         (FSCRYPT_POLICY_FLAG_IV_INO_LBLK_64 | FSCRYPT_POLICY_FLAG_IV_INO_LBLK_32)) != 0) {

        // We can only use this policy on ext4 if the "stable_inodes" feature

        // is set on the filesystem, otherwise shrinking will break encrypted files.

        if ((sb->s_feature_compat & cpu_to_le32(EXT4_FEATURE_COMPAT_STABLE_INODES)) == 0) {