commit 2f32cda63bf5c86db880d36029a27c8597fb5e3c
author Paul Lawrence <paullawrence@google.com> Tue May 05 14:28:25 2015 -0700
committer Paul Lawrence <paullawrence@google.com> Fri May 29 14:20:51 2015 -0700
tree d44043d671855e7809598668b7ec2a24407a246e
parent b7f0702ea6cc32c58540d596016c2dabd8ba3541

DO NOT MERGE Retry unmounts in ext4 encryption

(cherry-picked from commit 29b54aab8ee2d08e2129832364f9b719dd17fa4e)

Bug: 18151196
Change-Id: I52ca23b2ce3adcff44bd003d4a12243a0bd6ac34

cryptfs.c

diff --git a/cryptfs.c b/cryptfs.c
index 47b19a6..2306e4a 100644
--- a/cryptfs.c
+++ b/cryptfs.c
@@ -1426,7 +1426,7 @@
     return encrypt_master_key(passwd, salt, key_buf, master_key, crypt_ftr);
 }
 
-static int wait_and_unmount(char *mountpoint, bool kill)
+int wait_and_unmount(const char *mountpoint, bool kill)
 {
     int i, err, rc;
 #define WAIT_UNMOUNT_COUNT 20