commit 25cc7e3c335947db9439671c28f06bab83d6a4af
author John Cormie <jdcormie@google.com> Mon Apr 18 14:23:29 2016 -0700
committer John Cormie <jdcormie@google.com> Tue Apr 19 22:34:52 2016 +0000
tree 34740c4dfdad8f62ccd553ec1a8927ea20b7e6d4
parent cbedcc30b32d79d77d89f23074da4dc76bf5e26d

Unmount public sdcard filesystems before killing the fuse process.

Avoids ENOTCONN during eject for sdcard users.

Change-Id: I7b89ccaad4bb7af3639dc0b702168030a2f88366
Bug: 28268676

PublicVolume.cpp

diff --git a/PublicVolume.cpp b/PublicVolume.cpp
index e748de6..893f928 100644
--- a/PublicVolume.cpp
+++ b/PublicVolume.cpp
@@ -194,12 +194,10 @@
 }
 
 status_t PublicVolume::doUnmount() {
-    if (mFusePid > 0) {
-        kill(mFusePid, SIGTERM);
-        TEMP_FAILURE_RETRY(waitpid(mFusePid, nullptr, 0));
-        mFusePid = 0;
-    }
-
+    // Unmount the storage before we kill the FUSE process. If we kill
+    // the FUSE process first, most file system operations will return
+    // ENOTCONN until the unmount completes. This is an exotic and unusual
+    // error code and might cause broken behaviour in applications.
     KillProcessesUsingPath(getPath());
 
     ForceUnmount(kAsecPath);
@@ -209,6 +207,12 @@
     ForceUnmount(mFuseWrite);
     ForceUnmount(mRawPath);
 
+    if (mFusePid > 0) {
+        kill(mFusePid, SIGTERM);
+        TEMP_FAILURE_RETRY(waitpid(mFusePid, nullptr, 0));
+        mFusePid = 0;
+    }
+
     rmdir(mFuseDefault.c_str());
     rmdir(mFuseRead.c_str());
     rmdir(mFuseWrite.c_str());