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

Commit 85e938b1 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Revert^2 "Set block device as RO/RW before mount"" into main am: 1aaf2384 

Original change: https://android-review.googlesource.com/c/platform/system/core/+/3210086



Change-Id: I4cc945c3c8a80d97f72d55af35e34272a4a7362a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9e86a1c9 1aaf2384

fs_mgr/fs_mgr.cpp

+3 −3
Original line number Diff line number Diff line
@@ -823,6 +823,9 @@ static int __mount(const std::string& source, const std::string& target, const F 
    if (read_only) {

        mountflags |= MS_RDONLY;

    }

    if (!fs_mgr_set_blk_ro(source, read_only)) {

        PLOG(ERROR) << "Failed to set " << source << " as " << (read_only ? "RO" : "RW");

    }

    int ret = 0;

    int save_errno = 0;

    int gc_allowance = 0;
@@ -877,9 +880,6 @@ static int __mount(const std::string& source, const std::string& target, const F 
    }

    PINFO << __FUNCTION__ << "(source=" << source << source_missing << ",target=" << target

          << target_missing << ",type=" << entry.fs_type << ")=" << ret;

    if ((ret == 0) && (mountflags & MS_RDONLY) != 0) {

        fs_mgr_set_blk_ro(source);

    }

    if (ret == 0) {

        android::base::SetProperty("ro.boottime.init.mount." + Basename(target),

                                   std::to_string(t.duration().count()));