commit 0586d54053ee00e6d6523d4f125282ccb9a24aab
author San Mehat <san@google.com> Tue Jan 12 15:38:59 2010 -0800
committer San Mehat <san@google.com> Tue Jan 12 15:38:59 2010 -0800
tree a4ab1d9721cceace7f5b6a3797e2926f9c3a2e60
parent dfe79492a4f5280e9de2db6fa749a7781c59f2a6

vold2: Fix issue with destroying / unmounting asec

Signed-off-by: San Mehat <san@google.com>

VolumeManager.cpp

diff --git a/VolumeManager.cpp b/VolumeManager.cpp
index 9bdc980..596590d 100644
--- a/VolumeManager.cpp
+++ b/VolumeManager.cpp
@@ -293,7 +293,7 @@
              "/sdcard/android_secure/%s.asec", id);
     snprintf(mountPoint, sizeof(mountPoint), "/asec/%s", id);
 
-    if (isMountpointMounted(mountPoint)) {
+    if (!isMountpointMounted(mountPoint)) {
         LOGE("Unmount request for ASEC %s when not mounted", id);
         errno = EINVAL;
         return -1;
@@ -343,10 +343,17 @@
              "/sdcard/android_secure/%s.asec", id);
     snprintf(mountPoint, sizeof(mountPoint), "/asec/%s", id);
 
-    if (unmountAsec(id))
-        return -1;
+    if (isMountpointMounted(mountPoint)) {
+        if (unmountAsec(id)) {
+            LOGE("Failed to unmount asec %s for destroy (%s)", id, strerror(errno));
+            return -1;
+        }
+    }
 
-    unlink(asecFileName);
+    if (unlink(asecFileName)) {
+        LOGE("Failed to unlink asec %s (%s)", id, strerror(errno));
+        return -1;
+    }
 
     LOGD("ASEC %s destroyed", id);
     return 0;