commit ebc8801fb301ec33641b342b6758dd2985cd9816
author Paul Lawrence <paullawrence@google.com> Thu Jun 18 22:16:14 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Jun 18 22:16:14 2020 +0000
tree e816425386a3b951169ce3e116d7c01e54a93226
parent 026ae1a9acfb52d99fdb61c92d3b3d7855f359b9
parent 53f1d073392acf680af46f74fd5dbe9fc9031fa5

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

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

Change-Id: I54fdd3098c52dcb53cee0956f4dd1e43e09f5800

MetadataCrypt.cpp

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

cryptfs.cpp

diff --git a/cryptfs.cpp b/cryptfs.cpp
index 1ddb34b..8b7ac0a 100644
--- a/cryptfs.cpp
+++ b/cryptfs.cpp
@@ -1625,7 +1625,7 @@
         }
         bool needs_cp = android::vold::cp_needsCheckpoint();
         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) {
                 /* TODO: invoke something similar to
                    Process::killProcessWithOpenFiles(DATA_MNT_POINT,