USB: mon: kill BKL usage
compat_ioctl does not use the BKL, so I assume that the native function does not need it either. The open function is already protected by the driver's mutex, the BKL is probably not needed here either. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Cc: Alan Stern <stern@rowland.harvard.edu> Cc: Pete Zaitcev <zaitcev@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
parent
1548b13b75
commit
3b759c75fe
|
@ -646,17 +646,14 @@ static int mon_bin_open(struct inode *inode, struct file *file)
|
||||||
size_t size;
|
size_t size;
|
||||||
int rc;
|
int rc;
|
||||||
|
|
||||||
lock_kernel();
|
|
||||||
mutex_lock(&mon_lock);
|
mutex_lock(&mon_lock);
|
||||||
if ((mbus = mon_bus_lookup(iminor(inode))) == NULL) {
|
if ((mbus = mon_bus_lookup(iminor(inode))) == NULL) {
|
||||||
mutex_unlock(&mon_lock);
|
mutex_unlock(&mon_lock);
|
||||||
unlock_kernel();
|
|
||||||
return -ENODEV;
|
return -ENODEV;
|
||||||
}
|
}
|
||||||
if (mbus != &mon_bus0 && mbus->u_bus == NULL) {
|
if (mbus != &mon_bus0 && mbus->u_bus == NULL) {
|
||||||
printk(KERN_ERR TAG ": consistency error on open\n");
|
printk(KERN_ERR TAG ": consistency error on open\n");
|
||||||
mutex_unlock(&mon_lock);
|
mutex_unlock(&mon_lock);
|
||||||
unlock_kernel();
|
|
||||||
return -ENODEV;
|
return -ENODEV;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -689,7 +686,6 @@ static int mon_bin_open(struct inode *inode, struct file *file)
|
||||||
|
|
||||||
file->private_data = rp;
|
file->private_data = rp;
|
||||||
mutex_unlock(&mon_lock);
|
mutex_unlock(&mon_lock);
|
||||||
unlock_kernel();
|
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
err_allocbuff:
|
err_allocbuff:
|
||||||
|
@ -698,7 +694,6 @@ err_allocvec:
|
||||||
kfree(rp);
|
kfree(rp);
|
||||||
err_alloc:
|
err_alloc:
|
||||||
mutex_unlock(&mon_lock);
|
mutex_unlock(&mon_lock);
|
||||||
unlock_kernel();
|
|
||||||
return rc;
|
return rc;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -954,7 +949,7 @@ static int mon_bin_queued(struct mon_reader_bin *rp)
|
||||||
|
|
||||||
/*
|
/*
|
||||||
*/
|
*/
|
||||||
static int mon_bin_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
|
static long mon_bin_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
|
||||||
{
|
{
|
||||||
struct mon_reader_bin *rp = file->private_data;
|
struct mon_reader_bin *rp = file->private_data;
|
||||||
// struct mon_bus* mbus = rp->r.m_bus;
|
// struct mon_bus* mbus = rp->r.m_bus;
|
||||||
|
@ -1094,19 +1089,6 @@ static int mon_bin_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
static long mon_bin_unlocked_ioctl(struct file *file, unsigned int cmd,
|
|
||||||
unsigned long arg)
|
|
||||||
{
|
|
||||||
int ret;
|
|
||||||
|
|
||||||
lock_kernel();
|
|
||||||
ret = mon_bin_ioctl(file, cmd, arg);
|
|
||||||
unlock_kernel();
|
|
||||||
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
#ifdef CONFIG_COMPAT
|
#ifdef CONFIG_COMPAT
|
||||||
static long mon_bin_compat_ioctl(struct file *file,
|
static long mon_bin_compat_ioctl(struct file *file,
|
||||||
unsigned int cmd, unsigned long arg)
|
unsigned int cmd, unsigned long arg)
|
||||||
|
@ -1250,7 +1232,7 @@ static const struct file_operations mon_fops_binary = {
|
||||||
.read = mon_bin_read,
|
.read = mon_bin_read,
|
||||||
/* .write = mon_text_write, */
|
/* .write = mon_text_write, */
|
||||||
.poll = mon_bin_poll,
|
.poll = mon_bin_poll,
|
||||||
.unlocked_ioctl = mon_bin_unlocked_ioctl,
|
.unlocked_ioctl = mon_bin_ioctl,
|
||||||
#ifdef CONFIG_COMPAT
|
#ifdef CONFIG_COMPAT
|
||||||
.compat_ioctl = mon_bin_compat_ioctl,
|
.compat_ioctl = mon_bin_compat_ioctl,
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in a new issue