lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

viotape: Use unlocked_ioctl

Browse Source 
This pushes the BKL down into the driver.  Based on a patch by Alan Cox.

We need to do it this way for now as the inode parameter of viotap_ioctl
is used internally as a flag.  We should do a further cleanup patch.

Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
This commit is contained in:
Stephen Rothwell
2008-05-23 15:12:23 +10:00
committed by Paul Mackerras
parent 74f0609526
commit 10c0ad4dd9
1 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/char/viotape.c
View File

@@ -46,6 +46,7 @@
#include <linux/completion.h> #include <linux/completion.h>
#include <linux/proc_fs.h> #include <linux/proc_fs.h>
#include <linux/seq_file.h> #include <linux/seq_file.h>
#include <linux/smp_lock.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
#include <asm/ioctls.h> #include <asm/ioctls.h>
@@ -677,6 +678,17 @@ free_op:
return ret; return ret;
} }
static long viotap_unlocked_ioctl(struct file *file,
unsigned int cmd, unsigned long arg)
{
long rc;
lock_kernel();
rc = viotap_ioctl(file->f_path.dentry->d_inode, file, cmd, arg);
unlock_kernel();
return rc;
}
static int viotap_open(struct inode *inode, struct file *file) static int viotap_open(struct inode *inode, struct file *file)
{ {
HvLpEvent_Rc hvrc; HvLpEvent_Rc hvrc;
@@ -786,7 +798,7 @@ const struct file_operations viotap_fops = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.read = viotap_read, .read = viotap_read,
.write = viotap_write, .write = viotap_write,
.ioctl = viotap_ioctl, .unlocked_ioctl = viotap_unlocked_ioctl,
.open = viotap_open, .open = viotap_open,
.release = viotap_release, .release = viotap_release,
}; };