Commit e04ab2bc authored May 22, 2011 by Mandeep Singh Baines Committed by Ingo Molnar May 23, 2011

watchdog: Only disable/enable watchdog if neccessary



Don't take any action on an unsuccessful write to /proc.

Signed-off-by: Mandeep Singh Baines <msb@chromium.org>
Cc: Marcin Slusarz <marcin.slusarz@gmail.com>
Cc: Don Zickus <dzickus@redhat.com>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Link: http://lkml.kernel.org/r/1306127423-3347-2-git-send-email-msb@chromium.org


Signed-off-by: Ingo Molnar <mingo@elte.hu>

parent 824c6b7f

kernel/watchdog.c

+12 −8

Original line number	Diff line number	Diff line
		@@ -507,15 +507,19 @@ static void watchdog_disable_all_cpus(void)
		int proc_dowatchdog_enabled(struct ctl_table *table, int write,
		void __user buffer, size_t length, loff_t *ppos)
		{
		proc_dointvec(table, write, buffer, length, ppos);
		int ret;

		ret = proc_dointvec(table, write, buffer, length, ppos);
		if (ret \|\| !write)
		goto out;

		if (write) {
		if (watchdog_enabled)
		watchdog_enable_all_cpus();
		else
		watchdog_disable_all_cpus();
		}
		return 0;

		out:
		return ret;
		}

		int proc_dowatchdog_thresh(struct ctl_table *table, int write,