commit cc68996e78622eee28c010d4313b7295f411567b
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Wed Mar 23 01:00:54 2022 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Wed Mar 23 01:00:54 2022 +0000
tree c314cb5264710c3af02d5209b57cf3843e3ac2fd
parent dc7327a2e619c143f08a10e9e5a135ffb37aca5a
parent d8c1cc4e7cabb8ddfb6de82a6c0f8fede53c53c1

Snap for 8340624 from d8c1cc4e7cabb8ddfb6de82a6c0f8fede53c53c1 to tm-release

Change-Id: Id4a6a2ec5ab5d508f9f1b3ec6b2b572968d32ced

recovery_utils/roots.cpp

diff --git a/recovery_utils/roots.cpp b/recovery_utils/roots.cpp
index 7fe385b..5c95cba 100644
--- a/recovery_utils/roots.cpp
+++ b/recovery_utils/roots.cpp
@@ -154,11 +154,9 @@
   }
 
   bool needs_casefold = false;
-  bool needs_projid = false;
 
   if (volume == "/data") {
     needs_casefold = android::base::GetBoolProperty("external_storage.casefold.enabled", false);
-    needs_projid = android::base::GetBoolProperty("external_storage.projid.enabled", false);
   }
 
   int64_t length = 0;
@@ -202,11 +200,10 @@
       "/system/bin/mke2fs", "-F", "-t", "ext4", "-b", std::to_string(kBlockSize),
     };
 
-    // Project ID's require wider inodes. The Quotas themselves are enabled by tune2fs on boot.
-    if (needs_projid) {
-      mke2fs_args.push_back("-I");
-      mke2fs_args.push_back("512");
-    }
+    // Following is added for Project ID's quota as they require wider inodes.
+    // The Quotas themselves are enabled by tune2fs on boot.
+    mke2fs_args.push_back("-I");
+    mke2fs_args.push_back("512");
 
     if (v->fs_mgr_flags.ext_meta_csum) {
       mke2fs_args.push_back("-O");
@@ -255,10 +252,10 @@
     "-g",
     "android",
   };
-  if (needs_projid) {
-    make_f2fs_cmd.push_back("-O");
-    make_f2fs_cmd.push_back("project_quota,extra_attr");
-  }
+
+  make_f2fs_cmd.push_back("-O");
+  make_f2fs_cmd.push_back("project_quota,extra_attr");
+
   if (needs_casefold) {
     make_f2fs_cmd.push_back("-O");
     make_f2fs_cmd.push_back("casefold");