commit 46ace3b399c769cec358ca8d29949eb5340387a8
author Treehugger Robot <treehugger-gerrit@google.com> Thu May 21 20:25:19 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu May 21 20:25:19 2020 +0000
tree 043f51f6b2d6ae4fa719e1f107af9ad654a938ec
parent 08c2d559a9ef1759b67dce254072b150ad7d1e78
parent 04c09d39cf85859ec9e66a8219630f6f41f543cc

Merge "emmc_optimized means stable_inodes" am: eb3be2e28f am: 04c09d39cf

Change-Id: Ibe6ce706d256424eb3aae260c6ce7c38da124450

fs_mgr/fs_mgr.cpp

diff --git a/fs_mgr/fs_mgr.cpp b/fs_mgr/fs_mgr.cpp
index 485bbd5..c5e8651 100644
--- a/fs_mgr/fs_mgr.cpp
+++ b/fs_mgr/fs_mgr.cpp
@@ -454,7 +454,8 @@
                << 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) {