commit cd8f0aa8184054a3bc9451b3b413ae95ab07d794
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Feb 27 17:32:06 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Feb 27 17:32:06 2020 +0000
tree 8a77b287b09a6a8aa8f2f1842f1b913364003315
parent 8cec69c40c4b4c1c93b0349716362c0b8714f341
parent a07994e0293979178501dd792d4197716e10760e

Merge "fs_mgr: fix checking for casefold feature already enabled" into rvc-dev

fs_mgr/fs_mgr.cpp

diff --git a/fs_mgr/fs_mgr.cpp b/fs_mgr/fs_mgr.cpp
index 8840e7d..7bc4559 100644
--- a/fs_mgr/fs_mgr.cpp
+++ b/fs_mgr/fs_mgr.cpp
@@ -512,8 +512,7 @@
 // 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;