commit 5a1e03f7055f3fa1dfac25ead3989502aacce2a9
author Eric Biggers <ebiggers@google.com> Mon Oct 19 16:26:15 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Oct 19 16:26:15 2020 +0000
tree 496a65151d414851f7f1ecd1ee8f918e44d17fe0
parent 4d0d21e69d68b7e5625ef55008a7f96d3a758f3c
parent 80fdc5a4e32e1546ee38ed8f01978cc571235349

Merge "MetadataCrypt: remove unnecessary retry loop" am: 80fdc5a4e3

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

Change-Id: Id26dbda854480c74d07fcec87f1d045325bf625a

MetadataCrypt.cpp

diff --git a/MetadataCrypt.cpp b/MetadataCrypt.cpp
index 4b61373..4f35e9a 100644
--- a/MetadataCrypt.cpp
+++ b/MetadataCrypt.cpp
@@ -45,8 +45,6 @@
 #include "Utils.h"
 #include "VoldUtil.h"
 
-#define TABLE_LOAD_RETRIES 10
-
 namespace android {
 namespace vold {
 
@@ -215,18 +213,10 @@
     table.AddTarget(std::move(target));
 
     auto& dm = DeviceMapper::Instance();
-    for (int i = 0;; i++) {
-        if (dm.CreateDevice(dm_name, table, crypto_blkdev, std::chrono::seconds(5))) {
-            break;
-        }
-        if (i + 1 >= TABLE_LOAD_RETRIES) {
-            PLOG(ERROR) << "Could not create default-key device " << dm_name;
-            return false;
-        }
-        PLOG(INFO) << "Could not create default-key device, retrying";
-        usleep(500000);
+    if (!dm.CreateDevice(dm_name, table, crypto_blkdev, std::chrono::seconds(5))) {
+        PLOG(ERROR) << "Could not create default-key device " << dm_name;
+        return false;
     }
-
     return true;
 }