commit 1bb7a963c086d84a2acabfe7043f4c1d97bfbb63
author David Anderson <dvander@google.com> Thu Dec 15 17:26:59 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Dec 15 17:26:59 2022 +0000
tree ab052e89ef7e1f1f53c92d9c5d34866ac80703ec
parent 1edb6550abe80993c96d86d4130f9bbe71de1b98
parent 223c1b24992c868ec351cf0df44566020ac5ffd5

Merge "Skip new userdata pre-create logic on kernels < 5.15."

MetadataCrypt.cpp

diff --git a/MetadataCrypt.cpp b/MetadataCrypt.cpp
index df24901..91a8d62 100644
--- a/MetadataCrypt.cpp
+++ b/MetadataCrypt.cpp
@@ -90,15 +90,7 @@
         return;
     }
 
-    // On newer Linux kernels (5.15+), there is no uevent until DM_TABLE_LOAD,
-    // so we make sure the device is fully ready.
-    if (!dm.CreateEmptyDevice(kDmNameUserdata)) {
-        LOG(ERROR) << "Failed to pre-create userdata metadata encryption device";
-    }
-
-    DmTable table;
-    table.Emplace<DmTargetError>(0, 1);
-    if (!dm.LoadTable(kDmNameUserdata, table)) {
+    if (!dm.CreatePlaceholderDevice(kDmNameUserdata)) {
         LOG(ERROR) << "Failed to pre-create userdata metadata encryption device";
     }
 }