OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ixj: push BKL into driver and wrap ioctls 

Signed-off-by: Alan Cox <alan@redhat.com>
Cc: Nishanth Aravamudan <nacc@us.ibm.com>
Cc: Domen Puncer <domen@coderock.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Alan Cox 2008-07-25 01:48:16 -07:00 committed by Linus Torvalds
parent 11af7478ad
commit e05e9f7c4a
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/telephony/ixj.c
View File

@ -6095,15 +6095,15 @@ static int capabilities_check(IXJ *j, struct phone_capability *pcreq)
return retval; return retval;
} }
static int ixj_ioctl(struct inode *inode, struct file *file_p, unsigned int cmd, unsigned long arg) static long do_ixj_ioctl(struct file *file_p, unsigned int cmd, unsigned long arg)
{ {
IXJ_TONE ti; IXJ_TONE ti;
IXJ_FILTER jf; IXJ_FILTER jf;
IXJ_FILTER_RAW jfr; IXJ_FILTER_RAW jfr;
void __user *argp = (void __user *)arg; void __user *argp = (void __user *)arg;
struct inode *inode = file_p->f_path.dentry->d_inode;
unsigned int raise, mant;
unsigned int minor = iminor(inode); unsigned int minor = iminor(inode);
unsigned int raise, mant;
int board = NUM(inode); int board = NUM(inode);
IXJ *j = get_ixj(NUM(inode)); IXJ *j = get_ixj(NUM(inode));
@ -6661,6 +6661,15 @@ static int ixj_ioctl(struct inode *inode, struct file *file_p, unsigned int cmd,
return retval; return retval;
} }
static long ixj_ioctl(struct file *file_p, unsigned int cmd, unsigned long arg)
{
long ret;
lock_kernel();
ret = do_ixj_ioctl(file_p, cmd, arg);
unlock_kernel();
return ret;
}
static int ixj_fasync(int fd, struct file *file_p, int mode) static int ixj_fasync(int fd, struct file *file_p, int mode)
{ {
IXJ *j = get_ixj(NUM(file_p->f_path.dentry->d_inode)); IXJ *j = get_ixj(NUM(file_p->f_path.dentry->d_inode));
@ -6674,7 +6683,7 @@ static const struct file_operations ixj_fops =
.read = ixj_enhanced_read, .read = ixj_enhanced_read,
.write = ixj_enhanced_write, .write = ixj_enhanced_write,
.poll = ixj_poll, .poll = ixj_poll,
.ioctl = ixj_ioctl, .unlocked_ioctl = ixj_ioctl,
.release = ixj_release, .release = ixj_release,
.fasync = ixj_fasync .fasync = ixj_fasync
}; };