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

Merge "liblp: Always align the first usable sector."

Browse source
This commit is contained in:
Treehugger Robot 2018-10-19 05:29:17 +00:00 • committed by Gerrit Code Review
commit 1230ddc94b
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
fs_mgr/liblp/builder.cpp
View file

@ -268,8 +268,13 @@ bool MetadataBuilder::Init(const BlockDeviceInfo& device_info, uint32_t metadata
}
// Compute the first free sector, factoring in alignment.
uint64_t free_area_start =
AlignTo(total_reserved, device_info.alignment, device_info.alignment_offset);
uint64_t free_area_start = total_reserved;
if (device_info.alignment || device_info.alignment_offset) {
free_area_start =
AlignTo(free_area_start, device_info.alignment, device_info.alignment_offset);
} else {
free_area_start = AlignTo(free_area_start, device_info.logical_block_size);
}
uint64_t first_sector = free_area_start / LP_SECTOR_SIZE;
// There must be one logical block of free space remaining (enough for one partition).