Loading init/reboot.cpp +3 −3 Original line number Diff line number Diff line Loading @@ -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) { Loading Loading
init/reboot.cpp +3 −3 Original line number Diff line number Diff line Loading @@ -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) { Loading