commit 3574b085f46a5b22ee660a9fd3ef727a20c106ee
author Greg Hackmann <ghackmann@google.com> Wed Sep 24 23:32:00 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Sep 24 23:32:00 2014 +0000
tree db3c70c68f2d77f2e4ac756e5dd19e6101477ac6
parent 46a3a79a8f6b8b8eb66b1194a1a56b0ddcd4943b
parent 955653ebff68e29f5aeab3f05fddc199474e4174

Merge "cryptfs: log umount() failure reason" into lmp-dev

cryptfs.c

diff --git a/cryptfs.c b/cryptfs.c
index fb8b256..84f5587 100644
--- a/cryptfs.c
+++ b/cryptfs.c
@@ -1428,7 +1428,7 @@
 
 static int wait_and_unmount(char *mountpoint)
 {
-    int i, rc;
+    int i, err, rc;
 #define WAIT_UNMOUNT_COUNT 20
 
     /*  Now umount the tmpfs filesystem */
@@ -1440,6 +1440,7 @@
                  */
                 break;
             }
+            err = errno;
             sleep(1);
             i++;
         } else {
@@ -1452,7 +1453,7 @@
       rc = 0;
     } else {
       vold_killProcessesWithOpenFiles(mountpoint, 0);
-      SLOGE("unmounting %s failed\n", mountpoint);
+      SLOGE("unmounting %s failed: %s\n", mountpoint, strerror(err));
       rc = -1;
     }