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

Commit 6368ec17 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 6523363 from de8f3470 to mainline-release 

Change-Id: I118b9ffc293f432702caeb4d6461dfdb1a6d2a19
parents b0bd7402 de8f3470

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) {