Fix checkpoint on Taimen

Bug: 129494872
Test: VtsKernelCheckpointTest runs and passes
Change-Id: Ib2de866db7c847d569789d1aa6cdbad7c3ee7ff4
This commit is contained in:
Paul Lawrence 2019-03-29 13:06:34 -07:00
parent 95587b085e
commit e81f4c1945

View file

@ -291,7 +291,7 @@ static void cp_healthDaemon(std::string mnt_pnt, std::string blk_device, bool is
int ret; int ret;
std::string size_filename = std::string("/sys/") + blk_device.substr(5) + "/bow/free"; std::string size_filename = std::string("/sys/") + blk_device.substr(5) + "/bow/free";
std::string content; std::string content;
ret = android::base::ReadFileToString(kMetadataCPFile, &content); ret = android::base::ReadFileToString(size_filename, &content);
if (ret) { if (ret) {
free_bytes = std::strtoul(content.c_str(), NULL, 10); free_bytes = std::strtoul(content.c_str(), NULL, 10);
} }
@ -346,7 +346,7 @@ Status cp_prepareCheckpoint() {
} }
if (fstab_rec->fs_mgr_flags.checkpoint_blk || fstab_rec->fs_mgr_flags.checkpoint_fs) { 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::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) fstab_rec->fs_mgr_flags.checkpoint_fs == 1)
.detach(); .detach();
} }