diff options
| author | Keun-young Park <keunyoung@google.com> | 2017-07-19 22:23:48 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-07-19 22:23:48 +0000 |
| commit | 4e24aa2bc375db224a20f8d021eedd37c6288dc8 (patch) | |
| tree | 8d0c908cd64c090eb3178744085e4a22a09f1f02 /init/reboot.cpp | |
| parent | b945cc6de0312399099aee4d0578d0eb2291a06e (diff) | |
| parent | c13a2da2f4d43ea9f3155dba7fd7911db0ec0c94 (diff) | |
Merge "dump stack before kill all"
am: c13a2da2f4
Change-Id: Ie09fd8a7e95686c41d2a7af9e9e291f89c673036
Diffstat (limited to 'init/reboot.cpp')
| -rw-r--r-- | init/reboot.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/init/reboot.cpp b/init/reboot.cpp index 8196d58ed2..30a845cea2 100644 --- a/init/reboot.cpp +++ b/init/reboot.cpp @@ -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) { |