[Devel] [PATCH RHEL7 COMMIT] fence-watchdog: Port: diff-fence-watchdog-write-log-message-when-timer-elapses

Konstantin Khorenko khorenko at virtuozzo.com
Wed Nov 18 03:59:11 PST 2015


The commit is pushed to "branch-rh7-3.10.0-229.7.2.vz7.9.x-ovz" and will appear at https://src.openvz.org/scm/ovz/vzkernel.git
after rh7-3.10.0-229.7.2.vz7.9.10
------>
commit 2a935e228e9ef3afcdf80920ba5f162cb5333025
Author: Pavel Tikhomirov <ptikhomirov at virtuozzo.com>
Date:   Wed Nov 18 15:59:11 2015 +0400

    fence-watchdog: Port: diff-fence-watchdog-write-log-message-when-timer-elapses
    
    Author: Dmitry Guryanov
    Email: dguryanov at parallels.com
    Subject: watchdog: write log message when timer elapses
    Date: Fri, 15 Feb 2013 18:00:41 +0400
    
    * [fence-watchdog] a message is printed if the node is fenced
    	by watchdog (PSBM-18312)
    
    It's not possible to identify reason of reboot, so let's
    write the log message.
    
    https://jira.sw.ru/browse/PSBM-18312
    
    changes in v2:
    use bust_spinlocks, so that printk will never hang
    
    Signed-off-by: Dmitry Guryanov <dguryanov at parallels.com>
    
    Signed-off-by: Pavel Tikhomirov <ptikhomirov at virtuozzo.com>
    Acked-by: Andrew Vagin <avagin at virtuozzo.com>
---
 kernel/fence-watchdog.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/kernel/fence-watchdog.c b/kernel/fence-watchdog.c
index ca07da5..7938fcb 100644
--- a/kernel/fence-watchdog.c
+++ b/kernel/fence-watchdog.c
@@ -37,6 +37,11 @@ void fence_wdog_do_fence(void)
 {
 	char *killer = NULL;
 
+	bust_spinlocks(1);
+	printk(KERN_EMERG"fence-watchdog: %s\n",
+			action_names[fence_wdog_action]);
+	bust_spinlocks(0);
+
 	switch (fence_wdog_action) {
 	case FENCE_WDOG_CRASH:
 		panic_on_oops = 1;
@@ -52,7 +57,6 @@ void fence_wdog_do_fence(void)
 		lockdep_off();
 		local_irq_enable();
 		sysdev_shutdown();
-		printk(KERN_EMERG "System halted.\n");
 		kmsg_dump(KMSG_DUMP_HALT);
 		machine_halt();
 		break;


More information about the Devel mailing list