commit cb42a40a871bc8f06f0a37d321dbe2e7693da0e5
author Jeff Sharkey <jsharkey@google.com> Mon Oct 12 16:34:09 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Oct 12 16:34:09 2015 +0000
tree 0eda09589364fb3ee181baf34255fa7686d97a6e
parent 82fd804f8ba49399f425bf43681b9b7fe464d9a1
parent dadcceea7a8e931eaf970d95a297d8c89a0ebe9d

Merge "Clean up any/all stale partition tables." into mnc-dr-dev

cryptfs.c

diff --git a/cryptfs.c b/cryptfs.c
index 1a63a5b..33fa19b 100644
--- a/cryptfs.c
+++ b/cryptfs.c
@@ -2445,11 +2445,19 @@
         goto errout;
     }
 
-    if ( (data.cryptofd = open(crypto_blkdev, O_WRONLY|O_CLOEXEC)) < 0) {
-        SLOGE("Error opening crypto_blkdev %s for ext4 inplace encrypt. err=%d(%s)\n",
-              crypto_blkdev, errno, strerror(errno));
-        rc = ENABLE_INPLACE_ERR_DEV;
-        goto errout;
+    // Wait until the block device appears.  Re-use the mount retry values since it is reasonable.
+    int retries = RETRY_MOUNT_ATTEMPTS;
+    while ((data.cryptofd = open(crypto_blkdev, O_WRONLY|O_CLOEXEC)) < 0) {
+        if (--retries) {
+            SLOGE("Error opening crypto_blkdev %s for ext4 inplace encrypt. err=%d(%s), retrying\n",
+                  crypto_blkdev, errno, strerror(errno));
+            sleep(RETRY_MOUNT_DELAY_SECONDS);
+        } else {
+            SLOGE("Error opening crypto_blkdev %s for ext4 inplace encrypt. err=%d(%s)\n",
+                  crypto_blkdev, errno, strerror(errno));
+            rc = ENABLE_INPLACE_ERR_DEV;
+            goto errout;
+        }
     }
 
     if (setjmp(setjmp_env)) {