From 7776871d82050bac3e6bb307a68caef973305516 Mon Sep 17 00:00:00 2001 From: JP Abgrall Date: Fri, 10 Oct 2014 15:52:11 -0700 Subject: [PATCH] cryptfs: extra debugging around crypto blockdev dm-... errors. Some times the /dev/block/dm-0 fails to open after it has been setup. Log why. Bug: 17576594 Bug: 17942270 Change-Id: If0bbfe22d84137f2029bacb10873832038f0d36c --- cryptfs.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/cryptfs.c b/cryptfs.c index 718971a..6c20b4a 100644 --- a/cryptfs.c +++ b/cryptfs.c @@ -2424,15 +2424,15 @@ static int cryptfs_enable_inplace_ext4(char *crypto_blkdev, 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; } @@ -2561,8 +2561,8 @@ static int cryptfs_enable_inplace_f2fs(char *crypto_blkdev, 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; } @@ -2631,7 +2631,8 @@ static int cryptfs_enable_inplace_full(char *crypto_blkdev, char *real_blkdev, } 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; } -- 2.11.0