diff options
| author | Keun-young Park <keunyoung@google.com> | 2017-07-19 22:17:06 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-07-19 22:17:06 +0000 |
| commit | c13a2da2f4d43ea9f3155dba7fd7911db0ec0c94 (patch) | |
| tree | 7a658c6c65447a28a6e8e53e6e47c90d2eb9670e /init/reboot.cpp | |
| parent | 33913ebfb5ca699d09459227284b3d324343fa43 (diff) | |
| parent | c59b822d1f6705aad7c00b9a9a98d4f60d979fdc (diff) | |
Merge "dump stack before kill all"
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) { |