diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2022-03-23 21:57:14 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-03-23 21:57:14 +0000 |
| commit | f4dd7c88770a138bf3a073eb69f68be3331c5da1 (patch) | |
| tree | 99af42c95a161fe8fd710dc223caec68191122d9 | |
| parent | 16b7a74bcfe573dcead6cf40b45190c3ff5797c8 (diff) | |
| parent | 7f635c0bb11012248bcc25a708fee43c53e2c026 (diff) | |
| download | vold-f4dd7c88770a138bf3a073eb69f68be3331c5da1.tar.gz | |
Merge "Use make_f2fs -g android by default" am: fa9165f07b am: eb51baf132 am: 7f635c0bb1
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2037166
Change-Id: I92481ef22189435b0f5ef70992bbd718d752892e
| -rw-r--r-- | fs/F2fs.cpp | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/fs/F2fs.cpp b/fs/F2fs.cpp index 5012b280..55b08238 100644 --- a/fs/F2fs.cpp +++ b/fs/F2fs.cpp @@ -78,30 +78,18 @@ status_t Format(const std::string& source) { cmd.emplace_back("-f"); cmd.emplace_back("-d1"); - if (android::base::GetBoolProperty("vold.has_quota", false)) { - cmd.emplace_back("-O"); - cmd.emplace_back("quota"); - } - if (fscrypt_is_native()) { - cmd.emplace_back("-O"); - cmd.emplace_back("encrypt"); - } + cmd.emplace_back("-g"); + cmd.emplace_back("android"); + if (android::base::GetBoolProperty("vold.has_compress", false)) { cmd.emplace_back("-O"); cmd.emplace_back("compression"); cmd.emplace_back("-O"); cmd.emplace_back("extra_attr"); } - cmd.emplace_back("-O"); - cmd.emplace_back("verity"); const bool needs_casefold = android::base::GetBoolProperty("external_storage.casefold.enabled", false); - const bool needs_projid = true; - if (needs_projid) { - cmd.emplace_back("-O"); - cmd.emplace_back("project_quota,extra_attr"); - } if (needs_casefold) { cmd.emplace_back("-O"); cmd.emplace_back("casefold"); |