commit 8ca1ff755c4a689bce88f287ca227c91a9d0deac
author Treehugger Robot <treehugger-gerrit@google.com> Tue Jul 31 16:20:02 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jul 31 16:20:02 2018 +0000
tree 84e0255129e123157439253e5bd7678ed6adeb67
parent 1a9f60e7589cb8c68a0bcc40105dd148806913b4
parent c32759add710e9ba521d31e74e2c6ffeaef578ed

Merge "adb: Correctly detect deduplicated ext4 partitions."

adb/daemon/remount_service.cpp

diff --git a/adb/daemon/remount_service.cpp b/adb/daemon/remount_service.cpp
index 6588587..0e79d82 100644
--- a/adb/daemon/remount_service.cpp
+++ b/adb/daemon/remount_service.cpp
@@ -92,12 +92,13 @@
     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 @@
     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())) {