Merge "fs_mgr: remove atgc mount option for zoned device" am: 4ae0eb0f86 am: 978c70eccb am: 35dd0ef27a am: 24b771eb8b

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2222346

Change-Id: I219704caddda6290053a7a5eca98ae1efcf92ff1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Jaegeuk Kim 2022-09-22 01:59:42 +00:00 committed by Automerger Merge Worker
commit d735905e07

View file

@ -309,6 +309,12 @@ bool ParseFsMgrFlags(const std::string& flags, FstabEntry* entry) {
if (ReadFileToString("/sys/class/block/" + arg + "/queue/zoned", &zoned) &&
android::base::StartsWith(zoned, "host-managed")) {
entry->zoned_device = "/dev/block/" + arg;
// atgc in f2fs does not support a zoned device
auto options = Split(entry->fs_options, ",");
options.erase(std::remove(options.begin(), options.end(), "atgc"), options.end());
entry->fs_options = android::base::Join(options, ",");
LINFO << "Removed ATGC in fs_options as " << entry->fs_options;
} else {
LWARNING << "Warning: cannot find the zoned device: " << arg;
}