commit 7045aeba50271ffcdbbf6ed0f077613f1e1696cd
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Fri Jun 23 00:10:20 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Jun 23 00:10:20 2023 +0000
tree 707ba4c34d5fd34458f8c32c442b587869c9b86a
parent 55593258acb21c4a854facd9977030c910df0710
parent 4bc9e2517bed40b608623a50a2f8cf9d3a11b60f

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>

MetadataCrypt.cpp

diff --git a/MetadataCrypt.cpp b/MetadataCrypt.cpp
index 0c32c3b..dbd8fd1 100644
--- a/MetadataCrypt.cpp
+++ b/MetadataCrypt.cpp
@@ -104,8 +104,7 @@
     }
     auto mount_rc = fs_mgr_do_mount(&fstab_default, const_cast<char*>(mount_point),
                                     const_cast<char*>(blk_device), nullptr,
-                                    needs_encrypt? false: android::vold::cp_needsCheckpoint(),
-                                    true);
+                                    android::vold::cp_needsCheckpoint(), true, needs_encrypt);
     if (setexeccon(nullptr)) {
         PLOG(ERROR) << "Failed to clear setexeccon";
         return false;