summaryrefslogtreecommitdiff
path: root/drivers/char/dtlk.c
diff options
context:
space:
mode:
authorJonathan Corbet <corbet@lwn.net>2008-05-18 15:32:43 -0600
committerJonathan Corbet <corbet@lwn.net>2008-06-20 14:05:53 -0600
commitf2b9857eee17797541b845782ade4d7a9d50f843 (patch)
tree914a00afee2ff953199f99f7cf869e3fd83b36bd /drivers/char/dtlk.c
parent0b2806768899dba5967bcd4a3b93eaed9a1dc4f3 (diff)
downloadlinux-3.10-f2b9857eee17797541b845782ade4d7a9d50f843.tar.gz
linux-3.10-f2b9857eee17797541b845782ade4d7a9d50f843.tar.bz2
linux-3.10-f2b9857eee17797541b845782ade4d7a9d50f843.zip
Add a bunch of cycle_kernel_lock() calls
All of the open() functions which don't need the BKL on their face may still depend on its acquisition to serialize opens against driver initialization. So make those functions acquire then release the BKL to be on the safe side. Signed-off-by: Jonathan Corbet <corbet@lwn.net>
Diffstat (limited to 'drivers/char/dtlk.c')
-rw-r--r--drivers/char/dtlk.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/char/dtlk.c b/drivers/char/dtlk.c
index 433388c6023..6b900b297cc 100644
--- a/drivers/char/dtlk.c
+++ b/drivers/char/dtlk.c
@@ -56,6 +56,7 @@
#include <linux/errno.h> /* for -EBUSY */
#include <linux/ioport.h> /* for request_region */
#include <linux/delay.h> /* for loops_per_jiffy */
+#include <linux/smp_lock.h> /* cycle_kernel_lock() */
#include <asm/io.h> /* for inb_p, outb_p, inb, outb, etc. */
#include <asm/uaccess.h> /* for get_user, etc. */
#include <linux/wait.h> /* for wait_queue */
@@ -288,12 +289,12 @@ static int dtlk_ioctl(struct inode *inode,
}
}
-/* No BKL needed here; "dtlk_busy" is the only global resource,
- and it is not ever set by anybody (test is broken) */
+/* Note that nobody ever sets dtlk_busy... */
static int dtlk_open(struct inode *inode, struct file *file)
{
TRACE_TEXT("(dtlk_open");
+ cycle_kernel_lock();
nonseekable_open(inode, file);
switch (iminor(inode)) {
case DTLK_MINOR: