commit 2ebb5c5b9679a8ce96927aac55d621884834d173
author Ruslan Tkhakokhov <rthakohov@google.com> Fri Jun 21 10:34:43 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Jun 21 10:34:43 2019 +0000
tree 84dde154ca0b601a8d8e33174e7c1800c5ca9d17
parent ee5eb391697e3cf84ac74686294ba51c179b2db6
parent a37c01756f5a31369941361b0105a6853661e9f3

Merge "Merged-In Revert "vold: use RAII wake locks""

Loop.cpp

diff --git a/Loop.cpp b/Loop.cpp
index fa8f8ba..9fa876c 100644
--- a/Loop.cpp
+++ b/Loop.cpp
@@ -31,16 +31,20 @@
 
 #include <linux/kdev_t.h>
 
+#include <chrono>
+
 #include <android-base/logging.h>
 #include <android-base/stringprintf.h>
 #include <android-base/strings.h>
 #include <android-base/unique_fd.h>
+#include <fs_mgr/file_wait.h>
 #include <utils/Trace.h>
 
 #include "Loop.h"
 #include "VoldUtil.h"
 #include "sehandle.h"
 
+using namespace std::literals;
 using android::base::StringPrintf;
 using android::base::unique_fd;
 
@@ -74,6 +78,10 @@
         PLOG(ERROR) << "Failed to open " << target;
         return -errno;
     }
+    if (!android::fs_mgr::WaitForFile(out_device, 2s)) {
+        LOG(ERROR) << "Failed to find " << out_device;
+        return -ENOENT;
+    }
     unique_fd device_fd(open(out_device.c_str(), O_RDWR | O_CLOEXEC));
     if (device_fd.get() == -1) {
         PLOG(ERROR) << "Failed to open " << out_device;