commit 3fe931109c213dfe057161d8e32a4be3d3c8962c
author Paul Lawrence <paullawrence@google.com> Fri Jun 12 08:12:48 2020 -0700
committer Paul Lawrence <paullawrence@google.com> Fri Jun 12 09:13:42 2020 -0700
tree 2cd7b368b5a46ba39f7e1b37f994c49e9a897934
parent deb70854536ca7a8bddb11c95c311d3b784856aa

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

Bug: 156225476
Test: Build for f2fs and ext4 device, make sure checkpoints roll back
and commit

Change-Id: Ic15fadc67d306463dd0b554f679306d8f9081451

MetadataCrypt.cpp

diff --git a/MetadataCrypt.cpp b/MetadataCrypt.cpp
index 7891bee..bf0220e 100644
--- a/MetadataCrypt.cpp
+++ b/MetadataCrypt.cpp
@@ -103,7 +103,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 da748fd..7bcd835 100644
--- a/cryptfs.cpp
+++ b/cryptfs.cpp
@@ -1569,7 +1569,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,