commit 6343f2dc12f66b9b767f9715dd12bc613ec02867
author Zim <zezeozue@google.com> Mon Jun 22 17:21:12 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Jun 22 17:21:12 2020 +0000
tree 49f1e2c44b5f902b0b9daccbce1ee059798ab063
parent aaa78ed111619c569450e4819bf618df0f8a4b97
parent 3875f982dcad7feba042ed8e9b3e032a5fd36192

Unmount public volume if FUSE mount fails am: f71707916f am: c1f45db6e1 am: 3875f982dc

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/vold/+/11900947

Change-Id: I55d927eb0b7067aea68287dd5d89383ca4a45d9b

model/PublicVolume.cpp

diff --git a/model/PublicVolume.cpp b/model/PublicVolume.cpp
index 64b5dfa..9ca782b 100644
--- a/model/PublicVolume.cpp
+++ b/model/PublicVolume.cpp
@@ -238,6 +238,7 @@
 
         if (result != 0) {
             LOG(ERROR) << "Failed to mount public fuse volume";
+            doUnmount();
             return -result;
         }
 
@@ -247,6 +248,8 @@
             bool is_ready = false;
             callback->onVolumeChecking(std::move(fd), getPath(), getInternalPath(), &is_ready);
             if (!is_ready) {
+                LOG(ERROR) << "Failed to complete public volume mount";
+                doUnmount();
                 return -EIO;
             }
         }