diff options
| author | San Mehat <san@google.com> | 2010-02-24 08:25:55 -0800 |
|---|---|---|
| committer | San Mehat <san@google.com> | 2010-02-24 08:25:55 -0800 |
| commit | 0e382532f32e97f90056250f2b13c59840d2c6b4 (patch) | |
| tree | 53b7135b9b9048199520942281a9e61ec96f2248 | |
| parent | 52c2ccb6d25b94b96685efd4803226727710fbae (diff) | |
| download | android_system_vold-0e382532f32e97f90056250f2b13c59840d2c6b4.tar.gz android_system_vold-0e382532f32e97f90056250f2b13c59840d2c6b4.tar.bz2 android_system_vold-0e382532f32e97f90056250f2b13c59840d2c6b4.zip | |
vold: fix infinite loop when failing to unmount a busy container in unmountVolume()
Signed-off-by: San Mehat <san@google.com>
| -rw-r--r-- | VolumeManager.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/VolumeManager.cpp b/VolumeManager.cpp index 5a77c13..8e0165c 100644 --- a/VolumeManager.cpp +++ b/VolumeManager.cpp @@ -691,8 +691,8 @@ int VolumeManager::unmountVolume(const char *label, bool force) { AsecIdCollection::iterator it = mActiveContainers->begin(); LOGI("Unmounting ASEC %s (dependant on %s)", *it, v->getMountpoint()); if (unmountAsec(*it, force)) { - LOGE("Failed to unmount ASEC %s (%s) - unmount of %s may fail!", *it, - strerror(errno), v->getMountpoint()); + LOGE("Failed to unmount ASEC %s (%s)", *it, strerror(errno), v->getMountpoint()); + return -1; } } |