From c007c43335ebde667c06a56a9706b403d09c9dd6 Mon Sep 17 00:00:00 2001 From: Yongqin Liu Date: Fri, 23 Oct 2020 13:29:19 +0800 Subject: [PATCH] fs_mgr.cpp: fix the problem that the casefold feature not enabled for the data partition The value of entry.mount_point for data partition is "/data" Fixes: 5ba5b90cd6a3 ("fs_mgr: try tune2fs for casefolding on /data only") Test: got "Can't mount with encoding and encryption" problem reported by the db845c build with the default 5.4.38 prebuilt kernel Signed-off-by: Yongqin Liu Change-Id: I226a2275f5f2ee18503c5a3863ef5a1d2c2ed7be --- fs_mgr/fs_mgr.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs_mgr/fs_mgr.cpp b/fs_mgr/fs_mgr.cpp index 5ff01e187..fe7239332 100644 --- a/fs_mgr/fs_mgr.cpp +++ b/fs_mgr/fs_mgr.cpp @@ -527,7 +527,7 @@ static void tune_casefold(const std::string& blk_device, const FstabEntry& entry bool wants_casefold = android::base::GetBoolProperty("external_storage.casefold.enabled", false); - if (entry.mount_point != "data" || !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)) {