ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "remount: Ensure that scratch images are block-size aligned." am: c20b6b58fc

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

Change-Id: I60b46e05323e9a3aaaea069a1364067a2e515b29
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
David Anderson 2022-07-21 03:27:46 +00:00 • committed by Automerger Merge Worker
commit bc11b2b3f2
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
fs_mgr/fs_mgr_overlayfs.cpp
View file

@ -1140,7 +1140,13 @@ static inline uint64_t GetIdealDataScratchSize() {
return 0;
}
return std::min(super_info.size, (uint64_t(s.f_frsize) * s.f_bfree) / 2);
auto ideal_size = std::min(super_info.size, (uint64_t(s.f_frsize) * s.f_bfree) / 2);
// Align up to the filesystem block size.
if (auto remainder = ideal_size % s.f_bsize; remainder > 0) {
ideal_size += s.f_bsize - remainder;
}
return ideal_size;
}
static bool CreateScratchOnData(std::string* scratch_device, bool* partition_exists, bool* change) {