am 44710f0f: am 82fd804f: vold: Retry opening block device on failure when starting encryption
* commit '44710f0f9c868f999aecb91a8d3cd8bf9536b283':
vold: Retry opening block device on failure when starting encryption
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)) {