tequilaOS/platform_system_vold
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

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

Change-Id: Id26dbda854480c74d07fcec87f1d045325bf625a
This commit is contained in:
Eric Biggers 2020-10-19 16:26:15 +00:00 committed by Automerger Merge Worker
commit 5a1e03f705
1 changed files with 3 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
MetadataCrypt.cpp
View file

@ -45,8 +45,6 @@
#include "Utils.h"
#include "VoldUtil.h"
#define TABLE_LOAD_RETRIES 10
namespace android {
namespace vold {
@ -215,18 +213,10 @@ static bool create_crypto_blk_dev(const std::string& dm_name, const std::string&
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;
}