commit 8be3be31677479334d6e2fb325aec0f29bdebe6e
author Gao Xiang <gaoxiang25@huawei.com> Fri Feb 16 01:04:45 2018 +0000
committer android-build-merger <android-build-merger@google.com> Fri Feb 16 01:04:45 2018 +0000
tree 2cc05c79d49cac9d893edb120e4875a4172ae615
parent c1d81682e1a95d08eefc778c307e308c128a5123
parent 456483d19379391b05be2363cc740ee2d93b10e3

Merge "mFusePid should be cleared after waitpid successfully"
am: 456483d193

Change-Id: I61bf49cea396ebc8009a54740d7322249025acf0

EmulatedVolume.cpp

diff --git a/EmulatedVolume.cpp b/EmulatedVolume.cpp
index 21b290a..71eaa3e 100644
--- a/EmulatedVolume.cpp
+++ b/EmulatedVolume.cpp
@@ -105,7 +105,8 @@
         usleep(50000); // 50ms
     }
     /* sdcardfs will have exited already. FUSE will still be running */
-    TEMP_FAILURE_RETRY(waitpid(mFusePid, nullptr, WNOHANG));
+    if (TEMP_FAILURE_RETRY(waitpid(mFusePid, nullptr, WNOHANG)) == mFusePid)
+        mFusePid = 0;
 
     return OK;
 }

PublicVolume.cpp

diff --git a/PublicVolume.cpp b/PublicVolume.cpp
index f976c4a..4643a3a 100644
--- a/PublicVolume.cpp
+++ b/PublicVolume.cpp
@@ -191,7 +191,8 @@
         usleep(50000); // 50ms
     }
     /* sdcardfs will have exited already. FUSE will still be running */
-    TEMP_FAILURE_RETRY(waitpid(mFusePid, nullptr, WNOHANG));
+    if (TEMP_FAILURE_RETRY(waitpid(mFusePid, nullptr, WNOHANG)) == mFusePid)
+        mFusePid = 0;
 
     return OK;
 }