commit 3b2d66ee6177cc1c3a9c25547d93acbb9af1db32
author Wei Wang <wvw@google.com> Wed Oct 26 22:35:28 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed Oct 26 22:35:28 2016 +0000
tree c9a4a0e17d00c2f58e13a332811f81ff624de6d2
parent a627bb4f49a5f3ee0d9b256d8138e2518e8111c4
parent 632ed675d06137ea4cb0b582da0370dc6a831489

Merge "Make sure wait for the dm device"
am: d70a5feb60

Change-Id: If1e188c32548995413e49c1f7edece8d2c526bb2

fs_mgr/fs_mgr_verity.cpp

diff --git a/fs_mgr/fs_mgr_verity.cpp b/fs_mgr/fs_mgr_verity.cpp
index 7fe6763..031b042 100644
--- a/fs_mgr/fs_mgr_verity.cpp
+++ b/fs_mgr/fs_mgr_verity.cpp
@@ -341,6 +341,17 @@
     return 0;
 }
 
+static int test_access(char *device) {
+    int tries = 25;
+    while (tries--) {
+        if (!access(device, F_OK) || errno != ENOENT) {
+            return 0;
+        }
+        usleep(40 * 1000);
+    }
+    return -1;
+}
+
 static int check_verity_restart(const char *fname)
 {
     char buffer[VERITY_KMSG_BUFSIZE + 1];
@@ -1031,6 +1042,11 @@
     fstab->blk_device = verity_blk_name;
     verity_blk_name = 0;
 
+    // make sure we've set everything up properly
+    if (test_access(fstab->blk_device) < 0) {
+        goto out;
+    }
+
     retval = FS_MGR_SETUP_VERITY_SUCCESS;
 
 out: