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

Use target path when handling dm-bow

Browse source 
Refactor getting sysfs directory.

Bug: 312817490
Change-Id: Icc12002d3f5a2e24f86ce88e5e602cf7a71b0f84
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
This commit is contained in:
Jaegeuk Kim 2023-12-05 14:22:31 -08:00
parent ad51f09b05
commit 995dd0385e
1 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
fs_mgr/fs_mgr.cpp
View file

@ -1244,17 +1244,27 @@ class CheckpointManager {
};
std::string fs_mgr_find_bow_device(const std::string& block_device) {
if (block_device.substr(0, 5) != "/dev/") {
LOG(ERROR) << "Expected block device, got " << block_device;
return std::string();
// handle symlink such as "/dev/block/mapper/userdata"
std::string real_path;
if (!android::base::Realpath(block_device, &real_path)) {
real_path = block_device;
}
std::string sys_dir = std::string("/sys/") + block_device.substr(5);
struct stat st;
if (stat(real_path.c_str(), &st) < 0) {
PLOG(ERROR) << "stat failed: " << real_path;
return std::string();
}
if (!S_ISBLK(st.st_mode)) {
PLOG(ERROR) << real_path << " is not block device";
return std::string();
}
std::string sys_dir = android::base::StringPrintf("/sys/dev/block/%u:%u", major(st.st_rdev),
minor(st.st_rdev));
for (;;) {
std::string name;
if (!android::base::ReadFileToString(sys_dir + "/dm/name", &name)) {
PLOG(ERROR) << block_device << " is not dm device";
PLOG(ERROR) << real_path << " is not dm device";
return std::string();
}