Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4b9691c7 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Migrate mount/umount operations to a dedicated mMountsLock." am: b78dbeae 

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1897160

Change-Id: Icb672ab90456a91c4addf78e6fe00f7ca2a40ae3
parents 64d37149 b78dbeae

cmds/installd/InstalldNativeService.cpp

+4 −2
Original line number Diff line number Diff line
@@ -3011,8 +3011,9 @@ binder::Status InstalldNativeService::tryMountDataMirror( 


    const char* uuid_ = uuid->c_str();



    std::lock_guard<std::recursive_mutex> lock(mMountsLock);



    std::string mirrorVolCePath(StringPrintf("%s/%s", kDataMirrorCePath, uuid_));

    std::lock_guard<std::recursive_mutex> lock(mLock);

    if (fs_prepare_dir(mirrorVolCePath.c_str(), 0711, AID_SYSTEM, AID_SYSTEM) != 0) {

        return error("Failed to create CE mirror");

    }
@@ -3081,8 +3082,9 @@ binder::Status InstalldNativeService::onPrivateVolumeRemoved( 
    std::string mirrorCeVolPath(StringPrintf("%s/%s", kDataMirrorCePath, uuid_));

    std::string mirrorDeVolPath(StringPrintf("%s/%s", kDataMirrorDePath, uuid_));



    std::lock_guard<std::recursive_mutex> lock(mMountsLock);



    // Unmount CE storage

    std::lock_guard<std::recursive_mutex> lock(mLock);

    if (TEMP_FAILURE_RETRY(umount(mirrorCeVolPath.c_str())) != 0) {

        if (errno != ENOENT) {

            res = error(StringPrintf("Failed to umount %s %s", mirrorCeVolPath.c_str(),