Merge "liblp: Remove uses of alignment_offset." (bc3dec4e) · Commits · e / os / android_system_core

fs_mgr/liblp/builder.cpp

+1 −6

Original line number	Diff line number	Diff line
		@@ -383,11 +383,6 @@ static bool VerifyDeviceProperties(const BlockDeviceInfo& device_info) {
		<< " partition alignment is not sector-aligned.";
		return false;
		}
		if (device_info.alignment_offset > device_info.alignment) {
		LERROR << "Block device " << device_info.partition_name
		<< " partition alignment offset is greater than its alignment.";
		return false;
		}
		return true;
		}

		@@ -489,7 +484,7 @@ bool MetadataBuilder::Init(const std::vector<BlockDeviceInfo>& block_devices,
		// Compute the first free sector, factoring in alignment.
		uint64_t free_area_start = total_reserved;
		bool ok;
		if (super.alignment \|\| super.alignment_offset) {
		if (super.alignment) {
		ok = AlignTo(free_area_start, super.alignment, &free_area_start);
		} else {
		ok = AlignTo(free_area_start, logical_block_size, &free_area_start);

+2 −7

Original line number	Diff line number	Diff line
		@@ -176,10 +176,10 @@ TEST_F(BuilderTest, InternalAlignment) {
		ASSERT_NE(super_device, nullptr);
		EXPECT_EQ(super_device->first_logical_sector, 1536);

		// Alignment offset without alignment doesn't mean anything.
		// Alignment offset without alignment is ignored.
		device_info.alignment = 0;
		builder = MetadataBuilder::New(device_info, 1024, 2);
		ASSERT_EQ(builder, nullptr);
		ASSERT_NE(builder, nullptr);

		// Test a small alignment with an alignment offset.
		device_info.alignment = 12 * 1024;
		@@ -444,11 +444,6 @@ TEST_F(BuilderTest, MetadataTooLarge) {
		device_info.alignment = 131072;
		builder = MetadataBuilder::New(device_info, kMetadataSize, 1);
		EXPECT_EQ(builder, nullptr);

		device_info.alignment = 0;
		device_info.alignment_offset = 32768 - LP_SECTOR_SIZE;
		builder = MetadataBuilder::New(device_info, kMetadataSize, 1);
		EXPECT_EQ(builder, nullptr);
		}

		TEST_F(BuilderTest, UpdateBlockDeviceInfo) {