Merge "Remove waitpid on UnMount"

6 years ago · f6dbba8846
parent 456483d193 8b9a5b344e
commit f6dbba8846
2 changed files with 4 additions and 16 deletions
--- a/EmulatedVolume.cpp
+++ b/EmulatedVolume.cpp
@ -105,8 +105,8 @@ status_t EmulatedVolume::doMount() {
        usleep(50000); // 50ms
    }
    /* sdcardfs will have exited already. FUSE will still be running */
-    if (TEMP_FAILURE_RETRY(waitpid(mFusePid, nullptr, WNOHANG)) == mFusePid)
-        mFusePid = 0;
+    TEMP_FAILURE_RETRY(waitpid(mFusePid, nullptr, 0));
+    mFusePid = 0;

    return OK;
 }
@ -121,12 +121,6 @@ status_t EmulatedVolume::doUnmount() {
    ForceUnmount(mFuseRead);
    ForceUnmount(mFuseWrite);

-    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());
--- a/PublicVolume.cpp
+++ b/PublicVolume.cpp
@ -191,8 +191,8 @@ status_t PublicVolume::doMount() {
        usleep(50000); // 50ms
    }
    /* sdcardfs will have exited already. FUSE will still be running */
-    if (TEMP_FAILURE_RETRY(waitpid(mFusePid, nullptr, WNOHANG)) == mFusePid)
-        mFusePid = 0;
+    TEMP_FAILURE_RETRY(waitpid(mFusePid, nullptr, 0));
+    mFusePid = 0;

    return OK;
 }
@ -211,12 +211,6 @@ status_t PublicVolume::doUnmount() {
    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());