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

Merge "Use dm.CreateDevice() with a timeout."

Browse source
This commit is contained in:
Martijn Coenen 2020-10-12 18:07:39 +00:00 committed by Gerrit Code Review
commit e9023dc7bb
1 changed files with 1 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
MetadataCrypt.cpp
View file

@ -216,7 +216,7 @@ static bool create_crypto_blk_dev(const std::string& dm_name, const std::string&
auto& dm = DeviceMapper::Instance(); auto& dm = DeviceMapper::Instance();
for (int i = 0;; i++) { for (int i = 0;; i++) {
if (dm.CreateDevice(dm_name, table)) { if (dm.CreateDevice(dm_name, table, crypto_blkdev, std::chrono::seconds(5))) {
break; break;
} }
if (i + 1 >= TABLE_LOAD_RETRIES) { if (i + 1 >= TABLE_LOAD_RETRIES) {
@ -227,10 +227,6 @@ static bool create_crypto_blk_dev(const std::string& dm_name, const std::string&
usleep(500000); usleep(500000);
} }
if (!dm.GetDmDevicePathByName(dm_name, crypto_blkdev)) {
LOG(ERROR) << "Cannot retrieve default-key device status " << dm_name;
return false;
}
return true; return true;
} }