openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "adb: Correctly detect deduplicated ext4 partitions."

This commit is contained in:
Treehugger Robot 2018-07-31 16:20:02 +00:00 committed by Gerrit Code Review
parent d0d7d0a6b9 6dc508671b
commit 4c87c1743e
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
adb/daemon/remount_service.cpp
View File

@ -92,12 +92,13 @@ bool make_block_device_writable(const std::string& dev) {
return result;
}
static bool fs_has_shared_blocks(const char* dev) {
static bool fs_has_shared_blocks(const std::string& mount_point, const std::string& device) {
std::string path = mount_point + "/lost+found";
struct statfs fs;
if (statfs(dev, &fs) == -1 || fs.f_type == EXT4_SUPER_MAGIC) {
if (statfs(path.c_str(), &fs) == -1 || fs.f_type != EXT4_SUPER_MAGIC) {
return false;
}
unique_fd fd(unix_open(dev, O_RDONLY));
unique_fd fd(unix_open(device.c_str(), O_RDONLY));
if (fd < 0) {
return false;
}
@ -237,7 +238,7 @@ void remount_service(unique_fd fd, const std::string& cmd) {
std::set<std::string> dedup;
for (const auto& partition : partitions) {
std::string dev = find_mount(partition.c_str(), partition == "/");
if (dev.empty() || !fs_has_shared_blocks(dev.c_str())) {
if (dev.empty() || !fs_has_shared_blocks(partition, dev)) {
continue;
}
if (can_unshare_blocks(fd.get(), dev.c_str())) {