commit 1bb7e8a9289fdcf8805aaff13a5745be13b83bac
author Paul Lawrence <paullawrence@google.com> Thu Jun 18 21:56:10 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jun 18 21:56:10 2020 +0000
tree d2e9ed4834ec9036587b5984fbc80666ba6f879d
parent b50480bb96dc27d9da49bd7bb51f589d0957f9df
parent 3fe931109c213dfe057161d8e32a4be3d3c8962c

Merge "Don't call block checkpoint functions above dm-default-key"

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 5c075ac..c2c5936 100644
--- a/cryptfs.cpp
+++ b/cryptfs.cpp
@@ -1609,7 +1609,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,