Merge "fs_mgr_overlayfs: Add scratch size override system property" (e7f5532e) · Commits · e / os / android_system_core

fs_mgr/fs_mgr_overlayfs.cpp

+6 −1

Original line number	Diff line number	Diff line
		@@ -68,6 +68,8 @@ using android::fiemap::IImageManager;

		namespace {

		constexpr char kDataScratchSizeMbProp[] = "fs_mgr.overlayfs.data_scratch_size_mb";

		bool fs_mgr_access(const std::string& path) {
		return access(path.c_str(), F_OK) == 0;
		}
		@@ -1084,7 +1086,10 @@ static bool CreateScratchOnData(std::string* scratch_device, bool* partition_exi
		return false;
		}
		if (!images->BackingImageExists(partition_name)) {
		uint64_t size = GetIdealDataScratchSize();
		auto size = android::base::GetUintProperty<uint64_t>(kDataScratchSizeMbProp, 0) * 1_MiB;
		if (!size) {
		size = GetIdealDataScratchSize();
		}
		if (!size) {
		size = 2_GiB;
		}