commit d0c7c52edc0cda7947874bf73b3cced6d882b5d9
author Zimuzo Ezeozue <zezeozue@google.com> Thu Jan 16 22:27:27 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jan 16 22:27:27 2020 +0000
tree 0741002b1a920c38e4ceaa0f491887247113d557
parent 100e15e8e2041e3025e1766d83ca832f11df78f2
parent df073f50d2bf0cbdcec1cd922ac2f59d82a56df1

Merge "Handle failures after partial mounts"

model/EmulatedVolume.cpp

diff --git a/model/EmulatedVolume.cpp b/model/EmulatedVolume.cpp
index 054a58b..082dea5 100644
--- a/model/EmulatedVolume.cpp
+++ b/model/EmulatedVolume.cpp
@@ -245,12 +245,19 @@
             bool is_ready = false;
             callback->onVolumeChecking(std::move(fd), getPath(), getInternalPath(), &is_ready);
             if (!is_ready) {
+                fd.reset();
+                doUnmount();
                 return -EIO;
             }
         }
 
         // Only do the bind-mounts when we know for sure the FUSE daemon can resolve the path.
-        return mountFuseBindMounts();
+        status_t res = mountFuseBindMounts();
+        if (res != OK) {
+            fd.reset();
+            doUnmount();
+        }
+        return res;
     }
 
     return OK;