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

Commit d4f4a3fc authored by Keun-young Park's avatar Keun-young Park Committed by android-build-merger
Browse files

Merge "dump stack before kill all" am: c13a2da2 am: 4e24aa2b am: 2b33d96d 

am: f0a13c35

Change-Id: Id42c59a6488a9405c8f3301585d2b8cb18192197
parents 477b08d7 f0a13c35

init/reboot.cpp

+3 −3
Original line number Diff line number Diff line
@@ -323,11 +323,11 @@ static UmountStat TryUmountAndFsck(bool runFsck, std::chrono::milliseconds timeo 
    UmountStat stat = UmountPartitions(timeout - t.duration());

    if (stat != UMOUNT_STAT_SUCCESS) {

        LOG(INFO) << "umount timeout, last resort, kill all and try";

        if (DUMP_ON_UMOUNT_FAILURE) DumpUmountDebuggingInfo(false);

        if (DUMP_ON_UMOUNT_FAILURE) DumpUmountDebuggingInfo(true);

        KillAllProcesses();

        // even if it succeeds, still it is timeout and do not run fsck with all processes killed

        UmountPartitions(0ms);

        if (DUMP_ON_UMOUNT_FAILURE) DumpUmountDebuggingInfo(true);

        UmountStat st = UmountPartitions(0ms);

        if ((st != UMOUNT_STAT_SUCCESS) && DUMP_ON_UMOUNT_FAILURE) DumpUmountDebuggingInfo(false);

    }



    if (stat == UMOUNT_STAT_SUCCESS && runFsck) {