Merge "Don't Skip Checkpointing for F2fs" am: 4bc9e2517b
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2634095 Change-Id: I87bf9187bae9484d6a3f0b0f374bee18e5734434 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
commit
7045aeba50
1 changed files with 1 additions and 2 deletions
|
@ -104,8 +104,7 @@ static bool mount_via_fs_mgr(const char* mount_point, const char* blk_device, bo
|
||||||
}
|
}
|
||||||
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,
|
||||||
needs_encrypt? false: android::vold::cp_needsCheckpoint(),
|
android::vold::cp_needsCheckpoint(), true, needs_encrypt);
|
||||||
true);
|
|
||||||
if (setexeccon(nullptr)) {
|
if (setexeccon(nullptr)) {
|
||||||
PLOG(ERROR) << "Failed to clear setexeccon";
|
PLOG(ERROR) << "Failed to clear setexeccon";
|
||||||
return false;
|
return false;
|
||||||
|
|
Loading…
Reference in a new issue