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

Merge "fs_mgr: Add a method for creating one-off partition instances."

Browse source
This commit is contained in:
Treehugger Robot 2018-07-23 20:29:10 +00:00 • committed by Gerrit Code Review
commit 67c5ca20e2
2 changed files with 53 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
fs_mgr/fs_mgr_dm_linear.cpp
View file

@ -79,6 +79,25 @@ static bool CreateDmTable(const std::string& block_device, const LpMetadata& met
return true; return true;
} }
static bool CreateLogicalPartition(const std::string& block_device, const LpMetadata& metadata,
const LpMetadataPartition& partition, std::string* path) {
DeviceMapper& dm = DeviceMapper::Instance();
DmTable table;
if (!CreateDmTable(block_device, metadata, partition, &table)) {
return false;
}
std::string name = GetPartitionName(partition);
if (!dm.CreateDevice(name, table)) {
return false;
}
if (!dm.GetDmDevicePathByName(name, path)) {
return false;
}
LINFO << "Created logical partition " << name << " on device " << *path;
return true;
}
bool CreateLogicalPartitions(const std::string& block_device) { bool CreateLogicalPartitions(const std::string& block_device) {
uint32_t slot = SlotNumberForSlotSuffix(fs_mgr_get_slot_suffix()); uint32_t slot = SlotNumberForSlotSuffix(fs_mgr_get_slot_suffix());
auto metadata = ReadMetadata(block_device.c_str(), slot); auto metadata = ReadMetadata(block_device.c_str(), slot);
@ -86,23 +105,36 @@ bool CreateLogicalPartitions(const std::string& block_device) {
LOG(ERROR) << "Could not read partition table."; LOG(ERROR) << "Could not read partition table.";
return true; return true;
} }
DeviceMapper& dm = DeviceMapper::Instance();
for (const auto& partition : metadata->partitions) { for (const auto& partition : metadata->partitions) {
DmTable table;
if (!CreateDmTable(block_device, *metadata.get(), partition, &table)) {
return false;
}
std::string name = GetPartitionName(partition);
if (!dm.CreateDevice(name, table)) {
return false;
}
std::string path; std::string path;
dm.GetDmDevicePathByName(partition.name, &path); if (!CreateLogicalPartition(block_device, *metadata.get(), partition, &path)) {
LINFO << "Created logical partition " << name << " on device " << path; LERROR << "Could not create logical partition: " << GetPartitionName(partition);
return false;
}
} }
return true; return true;
} }
bool CreateLogicalPartition(const std::string& block_device, uint32_t metadata_slot,
const std::string& partition_name, std::string* path) {
auto metadata = ReadMetadata(block_device.c_str(), metadata_slot);
if (!metadata) {
LOG(ERROR) << "Could not read partition table.";
return true;
}
for (const auto& partition : metadata->partitions) {
if (GetPartitionName(partition) == partition_name) {
return CreateLogicalPartition(block_device, *metadata.get(), partition, path);
}
}
LERROR << "Could not find any partition with name: " << partition_name;
return false;
}
bool DestroyLogicalPartition(const std::string& name) {
DeviceMapper& dm = DeviceMapper::Instance();
return dm.DeleteDevice(name);
}
} // namespace fs_mgr } // namespace fs_mgr
} // namespace android } // namespace android

9
fs_mgr/include/fs_mgr_dm_linear.h
View file

@ -39,6 +39,15 @@ namespace fs_mgr {
bool CreateLogicalPartitions(const std::string& block_device); bool CreateLogicalPartitions(const std::string& block_device);
// Create a block device for a single logical partition, given metadata and
// the partition name. On success, a path to the partition's block device is
// returned.
bool CreateLogicalPartition(const std::string& block_device, uint32_t metadata_slot,
const std::string& partition_name, std::string* path);
// Destroy the block device for a logical partition, by name.
bool DestroyLogicalPartition(const std::string& name);
} // namespace fs_mgr } // namespace fs_mgr
} // namespace android } // namespace android