diff options
| author | Mandeep Singh Baines <msb@chromium.org> | 2011-05-22 22:10:21 -0700 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-05-23 11:58:58 +0200 |
| commit | e04ab2bc41b35c0cb6cdb07c8443f91aa738cf78 (patch) | |
| tree | 511efcd50f74c0a3cf28cf5c68eaa5e70b45fbc7 /kernel | |
| parent | 824c6b7f6294101f30e141117def224a56c203e6 (diff) | |
| download | blackbird-op-linux-e04ab2bc41b35c0cb6cdb07c8443f91aa738cf78.tar.gz blackbird-op-linux-e04ab2bc41b35c0cb6cdb07c8443f91aa738cf78.zip | |
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>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/watchdog.c | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/kernel/watchdog.c b/kernel/watchdog.c index a06972d71060..cf0e09f452e7 100644 --- a/kernel/watchdog.c +++ b/kernel/watchdog.c @@ -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; - if (write) { - if (watchdog_enabled) - watchdog_enable_all_cpus(); - else - watchdog_disable_all_cpus(); - } - return 0; + ret = proc_dointvec(table, write, buffer, length, ppos); + if (ret || !write) + goto out; + + if (watchdog_enabled) + watchdog_enable_all_cpus(); + else + watchdog_disable_all_cpus(); + +out: + return ret; } int proc_dowatchdog_thresh(struct ctl_table *table, int write, |
