tequilaOS/platform_system_core
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Use target device mapper given mapper target" into main

Browse source
This commit is contained in:
Jaegeuk Kim 2023-11-15 22:40:45 +00:00 committed by Gerrit Code Review
commit 191af79538
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
fs_mgr/libdm/dm.cpp
View file

@ -612,8 +612,12 @@ std::string DeviceMapper::GetTargetType(const struct dm_target_spec& spec) {
std::optional<std::string> ExtractBlockDeviceName(const std::string& path) {
static constexpr std::string_view kDevBlockPrefix("/dev/block/");
if (android::base::StartsWith(path, kDevBlockPrefix)) {
return path.substr(kDevBlockPrefix.length());
std::string real_path;
if (!android::base::Realpath(path, &real_path)) {
real_path = path;
}
if (android::base::StartsWith(real_path, kDevBlockPrefix)) {
return real_path.substr(kDevBlockPrefix.length());
}
return {};
}

4
fs_mgr/libdm/include/libdm/dm.h
View file

@ -52,8 +52,8 @@ enum class DmDeviceState { INVALID, SUSPENDED, ACTIVE };
static constexpr uint64_t kSectorSize = 512;
// Returns `path` without /dev/block prefix if and only if `path` starts with
// that prefix.
// Returns `path` without /dev/block prefix if `path` starts with that prefix.
// Or, if `path` is a symlink, do the same with its real path.
std::optional<std::string> ExtractBlockDeviceName(const std::string& path);
// This interface is for testing purposes. See DeviceMapper proper for what these methods do.