Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 24dafabd authored by David Anderson's avatar David Anderson Committed by android-build-merger
Browse files

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

am: 1230ddc9

Change-Id: Ib345aa0d01b5756fa1e3cfc8e5d6f6f8a3bcd18a
parents fdbcccb9 1230ddc9

fs_mgr/liblp/builder.cpp

+7 −2
Original line number Diff line number Diff line
@@ -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).