commit c05e7c0236b4d19dd5ac84c42bdf2f1d5459d3f7
author Paul Crowley <paulcrowley@google.com> Sat May 23 22:20:06 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat May 23 22:20:06 2020 +0000
tree f13eb08efddc6f558e457f8ff8a2e3093c782ea2
parent de933e859e08186089e38441313ee27bdfe65377
parent e96d6a90672875dbfc41afa164e83de705435790

Merge "emmc_optimized means stable_inodes" into rvc-dev

fs_mgr/fs_mgr.cpp

diff --git a/fs_mgr/fs_mgr.cpp b/fs_mgr/fs_mgr.cpp
index 76e3955..b8385d3 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) {