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

Merge "Don't call block checkpoint functions above dm-default-key" am: 1bb7e8a928 am: 53f1d07339

Browse source 
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1330879

Change-Id: I54fdd3098c52dcb53cee0956f4dd1e43e09f5800
This commit is contained in:
Paul Lawrence 2020-06-18 22:16:14 +00:00 committed by Automerger Merge Worker
commit ebc8801fb3
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
MetadataCrypt.cpp
View file

@ -99,7 +99,7 @@ static bool mount_via_fs_mgr(const char* mount_point, const char* blk_device) {
} }
auto mount_rc = fs_mgr_do_mount(&fstab_default, const_cast<char*>(mount_point), auto mount_rc = fs_mgr_do_mount(&fstab_default, const_cast<char*>(mount_point),
const_cast<char*>(blk_device), nullptr, const_cast<char*>(blk_device), nullptr,
android::vold::cp_needsCheckpoint()); android::vold::cp_needsCheckpoint(), true);
if (setexeccon(nullptr)) { if (setexeccon(nullptr)) {
PLOG(ERROR) << "Failed to clear setexeccon"; PLOG(ERROR) << "Failed to clear setexeccon";
return false; return false;

2
cryptfs.cpp
View file

@ -1625,7 +1625,7 @@ static int cryptfs_restart_internal(int restart_main) {
} }
bool needs_cp = android::vold::cp_needsCheckpoint(); bool needs_cp = android::vold::cp_needsCheckpoint();
while ((mount_rc = fs_mgr_do_mount(&fstab_default, DATA_MNT_POINT, crypto_blkdev, 0, while ((mount_rc = fs_mgr_do_mount(&fstab_default, DATA_MNT_POINT, crypto_blkdev, 0,
needs_cp)) != 0) { needs_cp, false)) != 0) {
if (mount_rc == FS_MGR_DOMNT_BUSY) { if (mount_rc == FS_MGR_DOMNT_BUSY) {
/* TODO: invoke something similar to /* TODO: invoke something similar to
Process::killProcessWithOpenFiles(DATA_MNT_POINT, Process::killProcessWithOpenFiles(DATA_MNT_POINT,