tequilaOS/platform_system_vold
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix error reporting in cp_commitChanges

Browse source 
Only trys to commit if necessary, and reports errors
if commiting fails. RemoveFileIfExists returns true on
success.

Test: vdc checkpoint startCheckpoint, reboot, and then
      vdc checkpoint commitChanges
Bug: 111020314

Change-Id: Ie1b3e49beb3ca04f2881fcc595882c607368b477
This commit is contained in:
Daniel Rosenberg 2018-11-08 22:18:37 -08:00
parent 622585b11b
commit 4b86df1426
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Checkpoint.cpp
View file

@ -82,6 +82,7 @@ Status cp_startCheckpoint(int retry) {
}
Status cp_commitChanges() {
if (!cp_needsCheckpoint()) return Status::ok();
// Must take action for list of mounted checkpointed things here
// To do this, we walk the list of mounted file systems.
// But we also need to get the matching fstab entries to see
@ -104,14 +105,17 @@ Status cp_commitChanges() {
if (fs_mgr_is_checkpoint_fs(fstab_rec)) {
if (!strcmp(fstab_rec->fs_type, "f2fs")) {
mount(mount_rec->blk_device, mount_rec->mount_point, "none",
MS_REMOUNT | fstab_rec->flags, "checkpoint=enable");
if (mount(mount_rec->blk_device, mount_rec->mount_point, "none",
MS_REMOUNT | fstab_rec->flags, "checkpoint=enable")) {
return Status::fromExceptionCode(EINVAL, "Failed to remount");
}
}
} else if (fs_mgr_is_checkpoint_blk(fstab_rec)) {
setBowState(mount_rec->blk_device, "2");
if (!setBowState(mount_rec->blk_device, "2"))
return Status::fromExceptionCode(EINVAL, "Failed to set bow state");
}
}
if (android::base::RemoveFileIfExists(kMetadataCPFile, &err_str))
if (!android::base::RemoveFileIfExists(kMetadataCPFile, &err_str))
return Status::fromExceptionCode(errno, err_str.c_str());
return Status::ok();
}