commit c052460659bd43c6cc408a17fef3ec3b27433108
author Treehugger Robot <treehugger-gerrit@google.com> Tue Oct 25 20:56:59 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Oct 25 20:56:59 2022 +0000
tree d566e24b10ad61b455147cae9b34cdd12c46c2bb
parent 7952a7b081f391370d50d2b6fae3db5ad1d923b8
parent 1c76ccb554b36b3caeb6c87e22ac05ff326c3781

Merge "fs_mgr_overlayfs: Fallback to allocate scratch on super if /data failed"

fs_mgr/fs_mgr_overlayfs.cpp

diff --git a/fs_mgr/fs_mgr_overlayfs.cpp b/fs_mgr/fs_mgr_overlayfs.cpp
index ef426dc..6290057 100644
--- a/fs_mgr/fs_mgr_overlayfs.cpp
+++ b/fs_mgr/fs_mgr_overlayfs.cpp
@@ -1133,7 +1133,9 @@
     // Try ImageManager on /data first.
     bool can_use_data = false;
     if (FilesystemHasReliablePinning("/data", &can_use_data) && can_use_data) {
-        return CreateScratchOnData(scratch_device, partition_exists);
+        if (CreateScratchOnData(scratch_device, partition_exists)) {
+            return true;
+        }
     }
     // If that fails, see if we can land on super.
     if (CanUseSuperPartition(fstab)) {