commit 2abc603e3d06929a064e64623718fc342fa87777
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Mar 24 07:28:55 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Mar 24 07:28:55 2022 +0000
tree ce53a5b72e700ca4ee038a4065098b5e45e3d1ad
parent f4dd7c88770a138bf3a073eb69f68be3331c5da1
parent 583ae3e55da03f0f1d80f6067cf74471bdeda180

Merge "FUSE-BPF: use both ro and persist properties" into tm-dev

fs/F2fs.cpp

diff --git a/fs/F2fs.cpp b/fs/F2fs.cpp
index 5012b28..55b0823 100644
--- a/fs/F2fs.cpp
+++ b/fs/F2fs.cpp
@@ -78,30 +78,18 @@
     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");