Merge "mFusePid should be cleared after waitpid successfully"

6 years ago · 456483d193
parent 35829f3968 9aec7a2fb6
commit 456483d193
2 changed files with 4 additions and 2 deletions
--- a/EmulatedVolume.cpp
+++ b/EmulatedVolume.cpp
@ -105,7 +105,8 @@ status_t EmulatedVolume::doMount() {
        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;
 }
--- a/PublicVolume.cpp
+++ b/PublicVolume.cpp
@ -191,7 +191,8 @@ status_t PublicVolume::doMount() {
        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;
 }