From 2941218397ad3b81b694f9a109c2653a47ac2529 Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Mon, 17 May 2010 19:08:29 +0200 Subject: Fix 582378: Report "INFO: possible recursive locking detected While at it, remove special-cased "appears to be on the same physical disk": it won't be selected anymore since now we search for "WARNING: at", not "Warning", and: WARNING: %s appears to be on the same physical disk as %s will not be erroneously caught. Signed-off-by: Denys Vlasenko --- lib/Plugins/KerneloopsSysLog.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'lib/Plugins/KerneloopsSysLog.cpp') diff --git a/lib/Plugins/KerneloopsSysLog.cpp b/lib/Plugins/KerneloopsSysLog.cpp index a5ee68b9..2dd5f804 100644 --- a/lib/Plugins/KerneloopsSysLog.cpp +++ b/lib/Plugins/KerneloopsSysLog.cpp @@ -232,15 +232,14 @@ next_line: oopsstart = i; else if (strstr(curline, "NETDEV WATCHDOG")) oopsstart = i; - else if (strstr(curline, "WARNING: at ") /* WARN_ON() generated message */ - && !strstr(curline, "appears to be on the same physical disk") - ) { + else if (strstr(curline, "WARNING: at ")) /* WARN_ON() generated message */ oopsstart = i; - } else if (strstr(curline, "Unable to handle kernel")) oopsstart = i; else if (strstr(curline, "sysctl table check failed")) oopsstart = i; + else if (strstr(curline, "INFO: possible recursive locking detected")) + oopsstart = i; else if (strstr(curline, "------------[ cut here ]------------")) oopsstart = i; else if (strstr(curline, "list_del corruption.")) -- cgit