diff options
| author | Martijn Coenen <maco@google.com> | 2020-10-12 18:46:02 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-10-12 18:46:02 +0000 |
| commit | 7da18c97eff49aba4964fa8bf1872889490e5592 (patch) | |
| tree | fe1a60d33500e7048d251ac96f415d2fbd5866e3 | |
| parent | fd4abc5e72b714000f8a6934adfff89dd9837a9a (diff) | |
| parent | e9023dc7bb621e4edd5b02cdf58f98579ebcd8f7 (diff) | |
| download | vold-7da18c97eff49aba4964fa8bf1872889490e5592.tar.gz | |
Merge "Use dm.CreateDevice() with a timeout." am: e9023dc7bb
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1456266
Change-Id: Id232a623d6aa3beaa3fdb5b31c722e96da6d75c9
| -rw-r--r-- | MetadataCrypt.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/MetadataCrypt.cpp b/MetadataCrypt.cpp index c61132c8..4b613738 100644 --- a/MetadataCrypt.cpp +++ b/MetadataCrypt.cpp @@ -216,7 +216,7 @@ static bool create_crypto_blk_dev(const std::string& dm_name, const std::string& auto& dm = DeviceMapper::Instance(); for (int i = 0;; i++) { - if (dm.CreateDevice(dm_name, table)) { + if (dm.CreateDevice(dm_name, table, crypto_blkdev, std::chrono::seconds(5))) { break; } 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); } - if (!dm.GetDmDevicePathByName(dm_name, crypto_blkdev)) { - LOG(ERROR) << "Cannot retrieve default-key device status " << dm_name; - return false; - } return true; } |