Merge "liblp: FlashPartitionTable should update all slots." (d1d06109) · Commits · e / os / android_system_core

fs_mgr/liblp/include/liblp/liblp.h

+1 −2

Original line number	Diff line number	Diff line
		@@ -42,8 +42,7 @@ struct LpMetadata {
		// existing geometry, and should not be used for normal partition table
		// updates. False can be returned if the geometry is incompatible with the
		// block device or an I/O error occurs.
		bool FlashPartitionTable(const std::string& block_device, const LpMetadata& metadata,
		uint32_t slot_number);
		bool FlashPartitionTable(const std::string& block_device, const LpMetadata& metadata);

		// Update the partition table for a given metadata slot number. False is
		// returned if an error occurs, which can include:

fs_mgr/liblp/io_test.cpp

+4 −5

Original line number	Diff line number	Diff line
		@@ -103,7 +103,7 @@ static unique_fd CreateFlashedDisk() {
		if (!exported) {
		return {};
		}
		if (!FlashPartitionTable(fd, *exported.get(), 0)) {
		if (!FlashPartitionTable(fd, *exported.get())) {
		return {};
		}
		return fd;
		@@ -132,7 +132,7 @@ TEST(liblp, ExportDiskTooSmall) {
		unique_fd fd = CreateFakeDisk();
		ASSERT_GE(fd, 0);

		EXPECT_FALSE(FlashPartitionTable(fd, *exported.get(), 0));
		EXPECT_FALSE(FlashPartitionTable(fd, *exported.get()));
		}

		// Test the basics of flashing a partition and reading it back.
		@@ -147,7 +147,7 @@ TEST(liblp, FlashAndReadback) {
		// Export and flash.
		unique_ptr<LpMetadata> exported = builder->Export();
		ASSERT_NE(exported, nullptr);
		ASSERT_TRUE(FlashPartitionTable(fd, *exported.get(), 0));
		ASSERT_TRUE(FlashPartitionTable(fd, *exported.get()));

		// Read back. Note that some fields are only filled in during
		// serialization, so exported and imported will not be identical. For
		@@ -354,8 +354,7 @@ TEST(liblp, TooManyPartitions) {
		ASSERT_GE(fd, 0);

		// Check that we are able to write our table.
		ASSERT_TRUE(FlashPartitionTable(fd, *exported.get(), 0));
		ASSERT_TRUE(UpdatePartitionTable(fd, *exported.get(), 1));
		ASSERT_TRUE(FlashPartitionTable(fd, *exported.get()));

		// Check that adding one more partition overflows the metadata allotment.
		partition = builder->AddPartition("final", TEST_GUID, LP_PARTITION_ATTR_NONE);

fs_mgr/liblp/writer.cpp

+8 −6

Original line number	Diff line number	Diff line
		@@ -196,7 +196,7 @@ static bool DefaultWriter(int fd, const std::string& blob) {
		return android::base::WriteFully(fd, blob.data(), blob.size());
		}

		bool FlashPartitionTable(int fd, const LpMetadata& metadata, uint32_t slot_number) {
		bool FlashPartitionTable(int fd, const LpMetadata& metadata) {
		// Before writing geometry and/or logical partition tables, perform some
		// basic checks that the geometry and tables are coherent, and will fit
		// on the given block device.
		@@ -224,8 +224,11 @@ bool FlashPartitionTable(int fd, const LpMetadata& metadata, uint32_t slot_numbe
		return false;
		}

		// Write metadata to the correct slot, now that geometry is in place.
		return WriteMetadata(fd, metadata.geometry, slot_number, metadata_blob, DefaultWriter);
		bool ok = true;
		for (size_t i = 0; i < metadata.geometry.metadata_slot_count; i++) {
		ok &= WriteMetadata(fd, metadata.geometry, i, metadata_blob, DefaultWriter);
		}
		return ok;
		}

		static bool CompareMetadata(const LpMetadata& a, const LpMetadata& b) {
		@@ -297,14 +300,13 @@ bool UpdatePartitionTable(int fd, const LpMetadata& metadata, uint32_t slot_numb
		return WriteMetadata(fd, geometry, slot_number, blob, writer);
		}

		bool FlashPartitionTable(const std::string& block_device, const LpMetadata& metadata,
		uint32_t slot_number) {
		bool FlashPartitionTable(const std::string& block_device, const LpMetadata& metadata) {
		android::base::unique_fd fd(open(block_device.c_str(), O_RDWR \| O_SYNC));
		if (fd < 0) {
		PERROR << __PRETTY_FUNCTION__ << "open failed: " << block_device;
		return false;
		}
		if (!FlashPartitionTable(fd, metadata, slot_number)) {
		if (!FlashPartitionTable(fd, metadata)) {
		return false;
		}
		LWARN << "Flashed new logical partition geometry to " << block_device;

fs_mgr/liblp/writer.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -30,7 +30,7 @@ std::string SerializeMetadata(const LpMetadata& input);

		// These variants are for testing only. The path-based functions should be used
		// for actual operation, so that open() is called with the correct flags.
		bool FlashPartitionTable(int fd, const LpMetadata& metadata, uint32_t slot_number);
		bool FlashPartitionTable(int fd, const LpMetadata& metadata);
		bool UpdatePartitionTable(int fd, const LpMetadata& metadata, uint32_t slot_number);

		bool UpdatePartitionTable(int fd, const LpMetadata& metadata, uint32_t slot_number,