commit 3ecba6b9277c0fd30a7f395ae31f3be2e70b1d23
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Mon Dec 04 02:53:30 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Dec 04 02:53:30 2023 +0000
tree f49b59cd5b540dc5114672c15e7f206071e0872a
parent 1784219094023817ab6ad79d8aaf10b11a90a823
parent 3a22c9e16e4dc17bd457a92271670429230c0d9f

Merge "fs_mgr_overlayfs: MapScratchPartitionIfNeeded always tries to create scratch" into main

fs_mgr/fs_mgr_overlayfs_control.cpp

diff --git a/fs_mgr/fs_mgr_overlayfs_control.cpp b/fs_mgr/fs_mgr_overlayfs_control.cpp
index fa2c5fe..06214ef 100644
--- a/fs_mgr/fs_mgr_overlayfs_control.cpp
+++ b/fs_mgr/fs_mgr_overlayfs_control.cpp
@@ -856,21 +856,6 @@
         return;
     }
 
-    bool want_scratch = false;
-    for (const auto& entry : fs_mgr_overlayfs_candidate_list(*fstab)) {
-        if (fs_mgr_is_verity_enabled(entry)) {
-            continue;
-        }
-        if (fs_mgr_overlayfs_already_mounted(fs_mgr_mount_point(entry.mount_point))) {
-            continue;
-        }
-        want_scratch = true;
-        break;
-    }
-    if (!want_scratch) {
-        return;
-    }
-
     if (ScratchIsOnData()) {
         if (auto images = IImageManager::Open("remount", 0ms)) {
             images->MapAllImages(init);