commit 8fe7f3104bc69a1ad4e73c516cad3b40b72ffbe3
author Gao Xiang <gaoxiang25@huawei.com> Fri Feb 16 01:24:40 2018 +0000
committer android-build-merger <android-build-merger@google.com> Fri Feb 16 01:24:40 2018 +0000
tree 5546010c85badef4ab46090e442ab583ad16191a
parent bf0ab0439cae12dbab43ed42d9a6ebae89c157a3
parent 8be3be31677479334d6e2fb325aec0f29bdebe6e

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

Change-Id: Ib55467c9719d5c578a51b0fc49b03dbc9bbe0870

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;
 }