commit 4c9b4d8c978433b4810c0449d4f376dbf7e74ab9
author JP Abgrall <jpa@google.com> Thu Oct 16 21:01:28 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Oct 16 21:01:28 2014 +0000
tree c38941e0b490e79caf57f017303754e783b9b45e
parent fd2180a97289732520328c69150419763ced48c1
parent 7776871d82050bac3e6bb307a68caef973305516

am 7776871d: cryptfs: extra debugging around crypto blockdev dm-... errors.

* commit '7776871d82050bac3e6bb307a68caef973305516':
  cryptfs: extra debugging around crypto blockdev dm-... errors.

cryptfs.c

diff --git a/cryptfs.c b/cryptfs.c
index 532c92c..b3bdb39 100644
--- a/cryptfs.c
+++ b/cryptfs.c
@@ -2426,15 +2426,15 @@
     data.crypto_blkdev = crypto_blkdev;
 
     if ( (data.realfd = open(real_blkdev, O_RDWR)) < 0) {
-        SLOGE("Error opening real_blkdev %s for inplace encrypt\n",
-              real_blkdev);
+        SLOGE("Error opening real_blkdev %s for inplace encrypt. err=%d(%s)\n",
+              real_blkdev, errno, strerror(errno));
         rc = -1;
         goto errout;
     }
 
     if ( (data.cryptofd = open(crypto_blkdev, O_WRONLY)) < 0) {
-        SLOGE("Error opening crypto_blkdev %s for inplace encrypt\n",
-              crypto_blkdev);
+        SLOGE("Error opening crypto_blkdev %s for inplace encrypt. err=%d(%s)\n",
+              crypto_blkdev, errno, strerror(errno));
         rc = -1;
         goto errout;
     }
@@ -2563,8 +2563,8 @@
         goto errout;
     }
     if ( (data.cryptofd = open64(crypto_blkdev, O_WRONLY)) < 0) {
-        SLOGE("Error opening crypto_blkdev %s for inplace encrypt\n",
-              crypto_blkdev);
+        SLOGE("Error opening crypto_blkdev %s for inplace encrypt. err=%d(%s)\n",
+              crypto_blkdev, errno, strerror(errno));
         goto errout;
     }
 
@@ -2633,7 +2633,8 @@
     }
 
     if ( (cryptofd = open(crypto_blkdev, O_WRONLY)) < 0) { 
-        SLOGE("Error opening crypto_blkdev %s for inplace encrypt\n", crypto_blkdev);
+        SLOGE("Error opening crypto_blkdev %s for inplace encrypt. err=%d(%s)\n",
+              crypto_blkdev, errno, strerror(errno));
         close(realfd);
         return -1;
     }