Commit 3e0420f0 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Jonathan Corbet

vmwatchdog: BKL pushdown

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parent 6c111d88
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
#include <linux/module.h> #include <linux/module.h>
#include <linux/moduleparam.h> #include <linux/moduleparam.h>
#include <linux/watchdog.h> #include <linux/watchdog.h>
#include <linux/smp_lock.h>
#include <asm/ebcdic.h> #include <asm/ebcdic.h>
#include <asm/io.h> #include <asm/io.h>
...@@ -131,11 +132,15 @@ static int __init vmwdt_probe(void) ...@@ -131,11 +132,15 @@ static int __init vmwdt_probe(void)
static int vmwdt_open(struct inode *i, struct file *f) static int vmwdt_open(struct inode *i, struct file *f)
{ {
int ret; int ret;
if (test_and_set_bit(0, &vmwdt_is_open)) lock_kernel();
if (test_and_set_bit(0, &vmwdt_is_open)) {
unlock_kernel();
return -EBUSY; return -EBUSY;
}
ret = vmwdt_keepalive(); ret = vmwdt_keepalive();
if (ret) if (ret)
clear_bit(0, &vmwdt_is_open); clear_bit(0, &vmwdt_is_open);
unlock_kernel();
return ret ? ret : nonseekable_open(i, f); return ret ? ret : nonseekable_open(i, f);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment