commit 3e97bfea9d2bea4a4b67407c68a12d333f6967b1
author Paul Lawrence <paullawrence@google.com> Tue Sep 02 21:44:45 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Sep 02 21:44:45 2014 +0000
tree 8301999529d34c937398e50188d78b977129a233
parent 70c3ee3781250fe10efc43ad95d0532eb876dd2c
parent 60dec16c5026d29a52791ad790860d247f47f8f2

am 60dec16c: Correctly remove asecs for full disk encryption

* commit '60dec16c5026d29a52791ad790860d247f47f8f2':
  Correctly remove asecs for full disk encryption

VolumeManager.cpp

diff --git a/VolumeManager.cpp b/VolumeManager.cpp
index b2b0cf6..14f1509 100644
--- a/VolumeManager.cpp
+++ b/VolumeManager.cpp
@@ -1090,8 +1090,14 @@
         SLOGE("Timed out trying to rmdir %s (%s)", mountPoint, strerror(errno));
     }
 
-    if (Devmapper::destroy(idHash) && errno != ENXIO) {
-        SLOGE("Failed to destroy devmapper instance (%s)", strerror(errno));
+    for (i=1; i <= UNMOUNT_RETRIES; i++) {
+        if (Devmapper::destroy(idHash) && errno != ENXIO) {
+            SLOGE("Failed to destroy devmapper instance (%s)", strerror(errno));
+            usleep(UNMOUNT_SLEEP_BETWEEN_RETRY_MS);
+            continue;
+        } else {
+          break;
+        }
     }
 
     char loopDevice[255];