commit e81f4c1945db31ae16784ccb6b2c3f7d192f5113
author Paul Lawrence <paullawrence@google.com> Fri Mar 29 13:06:34 2019 -0700
committer Paul Lawrence <paullawrence@google.com> Fri Mar 29 13:22:19 2019 -0700
tree 2249b283092512424f6b90cfc3f506faa2ec9085
parent 95587b085e5605bec6cebf7758d05731b384dbd3

Fix checkpoint on Taimen

Bug: 129494872
Test: VtsKernelCheckpointTest runs and passes
Change-Id: Ib2de866db7c847d569789d1aa6cdbad7c3ee7ff4

Checkpoint.cpp

diff --git a/Checkpoint.cpp b/Checkpoint.cpp
index 8605b6a..2b353f1 100644
--- a/Checkpoint.cpp
+++ b/Checkpoint.cpp
@@ -291,7 +291,7 @@
             int ret;
             std::string size_filename = std::string("/sys/") + blk_device.substr(5) + "/bow/free";
             std::string content;
-            ret = android::base::ReadFileToString(kMetadataCPFile, &content);
+            ret = android::base::ReadFileToString(size_filename, &content);
             if (ret) {
                 free_bytes = std::strtoul(content.c_str(), NULL, 10);
             }
@@ -346,7 +346,7 @@
         }
         if (fstab_rec->fs_mgr_flags.checkpoint_blk || fstab_rec->fs_mgr_flags.checkpoint_fs) {
             std::thread(cp_healthDaemon, std::string(mount_rec.mount_point),
-                        std::string(mount_rec.mount_point),
+                        std::string(mount_rec.blk_device),
                         fstab_rec->fs_mgr_flags.checkpoint_fs == 1)
                 .detach();
         }