commit d4f4a3fcf9bd63d8ba555b62944576045cb02bfc
author Keun-young Park <keunyoung@google.com> Wed Jul 19 22:32:50 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Jul 19 22:32:50 2017 +0000
tree b5002fa81bb3b580e571b4c7e8f3755d1d558ebc
parent 477b08d7ee955d68589f5869707bb2aaf26efcf1
parent f0a13c35f2d9688de5bc106b157dffd54ec66b43

Merge "dump stack before kill all" am: c13a2da2f4 am: 4e24aa2bc3 am: 2b33d96db1
am: f0a13c35f2

Change-Id: Id42c59a6488a9405c8f3301585d2b8cb18192197

init/reboot.cpp

diff --git a/init/reboot.cpp b/init/reboot.cpp
index 8196d58..30a845c 100644
--- a/init/reboot.cpp
+++ b/init/reboot.cpp
@@ -323,11 +323,11 @@
     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) {