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

Merge "libdm: Make ExtractBlockDeviceName() return its result" into sc-dev

Browse source
This commit is contained in:
TreeHugger Robot 2021-08-17 05:38:09 +00:00 • committed by Android (Google) Code Review
commit 232ec664b1
1 changed files with 13 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
fs_mgr/libdm/dm.cpp
View file

@ -560,34 +560,30 @@ std::string DeviceMapper::GetTargetType(const struct dm_target_spec& spec) {
return std::string{spec.target_type, sizeof(spec.target_type)};
}
static bool ExtractBlockDeviceName(const std::string& path, std::string* name) {
static std::optional<std::string> ExtractBlockDeviceName(const std::string& path) {
static constexpr std::string_view kDevBlockPrefix("/dev/block/");
if (android::base::StartsWith(path, kDevBlockPrefix)) {
*name = path.substr(kDevBlockPrefix.length());
return true;
return path.substr(kDevBlockPrefix.length());
}
return false;
return {};
}
bool DeviceMapper::IsDmBlockDevice(const std::string& path) {
std::string name;
if (!ExtractBlockDeviceName(path, &name)) {
return false;
}
return android::base::StartsWith(name, "dm-");
std::optional<std::string> name = ExtractBlockDeviceName(path);
return name && android::base::StartsWith(*name, "dm-");
}
std::optional<std::string> DeviceMapper::GetDmDeviceNameByPath(const std::string& path) {
std::string name;
if (!ExtractBlockDeviceName(path, &name)) {
std::optional<std::string> name = ExtractBlockDeviceName(path);
if (!name) {
LOG(WARNING) << path << " is not a block device";
return std::nullopt;
}
if (!android::base::StartsWith(name, "dm-")) {
if (!android::base::StartsWith(*name, "dm-")) {
LOG(WARNING) << path << " is not a dm device";
return std::nullopt;
}
std::string dm_name_file = "/sys/block/" + name + "/dm/name";
std::string dm_name_file = "/sys/block/" + *name + "/dm/name";
std::string dm_name;
if (!android::base::ReadFileToString(dm_name_file, &dm_name)) {
PLOG(ERROR) << "Failed to read file " << dm_name_file;
@ -598,16 +594,16 @@ std::optional<std::string> DeviceMapper::GetDmDeviceNameByPath(const std::string
}
std::optional<std::string> DeviceMapper::GetParentBlockDeviceByPath(const std::string& path) {
std::string name;
if (!ExtractBlockDeviceName(path, &name)) {
std::optional<std::string> name = ExtractBlockDeviceName(path);
if (!name) {
LOG(WARNING) << path << " is not a block device";
return std::nullopt;
}
if (!android::base::StartsWith(name, "dm-")) {
if (!android::base::StartsWith(*name, "dm-")) {
// Reached bottom of the device mapper stack.
return std::nullopt;
}
auto slaves_dir = "/sys/block/" + name + "/slaves";
auto slaves_dir = "/sys/block/" + *name + "/slaves";
auto dir = std::unique_ptr<DIR, decltype(&closedir)>(opendir(slaves_dir.c_str()), closedir);
if (dir == nullptr) {
PLOG(ERROR) << "Failed to open: " << slaves_dir;