Attachment 311299 Details for Bug 248666 – NEC-supplied patch

NEC-supplied patch

linux-2.6.9-diskdump-reboot-on-err.patch (text/x-patch), 3.18 KB, created by Guy Streeter on 2008-07-08 17:29:21 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Guy Streeter

Created: 2008-07-08 17:29:21 UTC

Size: 3.18 KB

patch

obsolete

>diff -ruNp linux-2.6.9.old/drivers/block/diskdump.c linux-2.6.9/drivers/block/diskdump.c
>--- linux-2.6.9.old/drivers/block/diskdump.c	2007-05-22 13:50:01.000000000 +0900
>+++ linux-2.6.9/drivers/block/diskdump.c	2007-05-23 11:41:05.000000000 +0900
>@@ -66,12 +66,14 @@
> #define USER_PARAM_BLOCK	2
> 
> static int fallback_on_err = 1;
>+static int reboot_on_err = 1;
> static int allow_risky_dumps = 1;
> static unsigned int block_order = 2;
> static int sample_rate = 8;
> static int dump_level = 0;
> static int compress = 0;
> module_param_named(fallback_on_err, fallback_on_err, bool, S_IRUGO|S_IWUSR);
>+module_param_named(reboot_on_err, reboot_on_err, bool, S_IRUGO|S_IWUSR);
> module_param_named(allow_risky_dumps, allow_risky_dumps, bool, S_IRUGO|S_IWUSR);
> module_param_named(block_order, block_order, uint, S_IRUGO|S_IWUSR);
> module_param_named(sample_rate, sample_rate, int, S_IRUGO|S_IWUSR);
>@@ -132,6 +134,7 @@ enum disk_dump_states disk_dump_state = 
> EXPORT_SYMBOL_GPL(disk_dump_state);
> 
> extern int panic_timeout;
>+extern int reboot_on_dump_err;
> extern unsigned long max_pfn;
> 
> static asmlinkage void disk_dump(struct pt_regs *, void *);
>@@ -855,11 +858,17 @@ static void start_disk_dump(struct pt_re
> done:
> 	/*
> 	 * If diskdump failed and fallback_on_err is set,
>-	 * We just return and leave panic to netdump.
>+	 * we just return and leave panic to netdump.
>+	 * If reboot_on_err isn't set and netdump isn't enabled,
>+	 * the system doesn't reboot after dump failure.
> 	 */
> 	if (dump_err) {
> 		disk_dump_state = DISK_DUMP_FAILURE;
> 		if (fallback_on_err && dump_err) {
>+			if (reboot_on_err)
>+				reboot_on_dump_err = 1;
>+			else
>+				reboot_on_dump_err = 0;
> 			Info("diskdump failed, fall back to trying netdump");
> 			return;
> 		}
>@@ -872,7 +881,8 @@ done:
> 	Dbg("notify panic.");
> 	notifier_call_chain(&panic_notifier_list, 0, NULL);
> 
>-	if (panic_timeout > 0) {
>+	if (panic_timeout > 0
>+		&& (!dump_err || (dump_err && reboot_on_err))) {
> 		int i;
> 		/*
> 	 	 * Delay timeout seconds before rebooting the machine. 
>@@ -1312,6 +1322,7 @@ static int disk_dump_seq_show(struct seq
> 		seq_printf(seq, "# sample_rate: %u\n", sample_rate);
> 		seq_printf(seq, "# block_order: %u\n", block_order);
> 		seq_printf(seq, "# fallback_on_err: %u\n", fallback_on_err);
>+		seq_printf(seq, "# reboot_on_err: %u\n", reboot_on_err);
> 		seq_printf(seq, "# allow_risky_dumps: %u\n", allow_risky_dumps);
> 		seq_printf(seq, "# dump_level: %d\n", dump_level);
> 		seq_printf(seq, "# compress: %d\n", compress);
>diff -ruNp linux-2.6.9.old/kernel/panic.c linux-2.6.9/kernel/panic.c
>--- linux-2.6.9.old/kernel/panic.c	2007-05-22 13:50:01.000000000 +0900
>+++ linux-2.6.9/kernel/panic.c	2007-05-23 10:37:16.000000000 +0900
>@@ -21,11 +21,13 @@
> #include <linux/nmi.h>
> 
> int panic_timeout;
>+int reboot_on_dump_err = 1;
> int panic_on_oops = 1;
> int panic_on_unrecovered_nmi;
> int tainted;
> 
> EXPORT_SYMBOL(panic_timeout);
>+EXPORT_SYMBOL_GPL(reboot_on_dump_err);
> 
> struct notifier_block *panic_notifier_list;
> 
>@@ -81,7 +83,7 @@ NORET_TYPE void panic(const char * fmt, 
> 
>        notifier_call_chain(&panic_notifier_list, 0, buf);
> 
>-	if (panic_timeout > 0)
>+	if (panic_timeout > 0 && reboot_on_dump_err)
> 	{
> 		/*
> 	 	 * Delay timeout seconds before rebooting the machine.

Actions: View

Attachments on bug 248666: 159493 | 311298 | 311299 | 311300 | 326668