monreader: BKL pushdown

[jmc: added <linux/smp_lock.h>]

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Jonathan Corbet <corbet@lwn.net>
This commit is contained in:
Arnd Bergmann 2008-05-20 19:16:17 +02:00 committed by Jonathan Corbet
parent 77149367da
commit 6ce46a435a

View file

@ -11,6 +11,7 @@
#include <linux/module.h> #include <linux/module.h>
#include <linux/moduleparam.h> #include <linux/moduleparam.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/smp_lock.h>
#include <linux/errno.h> #include <linux/errno.h>
#include <linux/types.h> #include <linux/types.h>
#include <linux/kernel.h> #include <linux/kernel.h>
@ -340,6 +341,7 @@ static int mon_open(struct inode *inode, struct file *filp)
/* /*
* only one user allowed * only one user allowed
*/ */
lock_kernel();
rc = -EBUSY; rc = -EBUSY;
if (test_and_set_bit(MON_IN_USE, &mon_in_use)) if (test_and_set_bit(MON_IN_USE, &mon_in_use))
goto out; goto out;
@ -377,6 +379,7 @@ static int mon_open(struct inode *inode, struct file *filp)
} }
P_INFO("open, established connection to *MONITOR service\n\n"); P_INFO("open, established connection to *MONITOR service\n\n");
filp->private_data = monpriv; filp->private_data = monpriv;
unlock_kernel();
return nonseekable_open(inode, filp); return nonseekable_open(inode, filp);
out_path: out_path:
@ -386,6 +389,7 @@ static int mon_open(struct inode *inode, struct file *filp)
out_use: out_use:
clear_bit(MON_IN_USE, &mon_in_use); clear_bit(MON_IN_USE, &mon_in_use);
out: out:
unlock_kernel();
return rc; return rc;
} }