Commit 31faa67c authored Oct 25, 2022 by Treehugger Robot Committed by Automerger Merge Worker Oct 25, 2022

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

Merge "fs_mgr_overlayfs: Fallback to allocate scratch on super if /data failed" am: c0524606 am: 86d6d6da

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2269727

Change-Id: Ibfb2896bb950b31e8a5f7ae77bf2f98092feb1d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

fs_mgr/fs_mgr_overlayfs.cpp

+3 −1

Original line number	Diff line number	Diff line
		@@ -1133,7 +1133,9 @@ bool fs_mgr_overlayfs_create_scratch(const Fstab& fstab, std::string* scratch_de
		// 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)) {