From 5ba5b90cd6a3ee84136f269e89cb7454396e29a8 Mon Sep 17 00:00:00 2001 From: Jaegeuk Kim Date: Fri, 14 Aug 2020 12:34:36 -0700 Subject: [PATCH] fs_mgr: try tune2fs for casefolding on /data only Bug: 163420666 Signed-off-by: Jaegeuk Kim Change-Id: Id646bd25d6fed0f547fb0647150acdc4845a5eec --- fs_mgr/fs_mgr.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/fs_mgr/fs_mgr.cpp b/fs_mgr/fs_mgr.cpp index 1462cc91b..38472dec0 100644 --- a/fs_mgr/fs_mgr.cpp +++ b/fs_mgr/fs_mgr.cpp @@ -521,13 +521,13 @@ static void tune_verity(const std::string& blk_device, const FstabEntry& entry, } // Enable casefold if needed. -static void tune_casefold(const std::string& blk_device, const struct ext4_super_block* sb, - int* fs_stat) { +static void tune_casefold(const std::string& blk_device, const FstabEntry& entry, + const struct ext4_super_block* sb, int* fs_stat) { bool has_casefold = (sb->s_feature_incompat & cpu_to_le32(EXT4_FEATURE_INCOMPAT_CASEFOLD)) != 0; bool wants_casefold = android::base::GetBoolProperty("external_storage.casefold.enabled", false); - if (!wants_casefold || has_casefold) return; + if (entry.mount_point != "data" || !wants_casefold || has_casefold ) return; std::string casefold_support; if (!android::base::ReadFileToString(SYSFS_EXT4_CASEFOLD, &casefold_support)) { @@ -696,7 +696,7 @@ static int prepare_fs_for_mount(const std::string& blk_device, const FstabEntry& tune_reserved_size(blk_device, entry, &sb, &fs_stat); tune_encrypt(blk_device, entry, &sb, &fs_stat); tune_verity(blk_device, entry, &sb, &fs_stat); - tune_casefold(blk_device, &sb, &fs_stat); + tune_casefold(blk_device, entry, &sb, &fs_stat); tune_metadata_csum(blk_device, entry, &sb, &fs_stat); } }