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

dv1394: remove BKL contention

Browse Source 
Purges the one remaining call to lock_kernel() from the 1394 subsystem.

Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
This commit is contained in:
Stefan Richter
2006-10-20 21:01:58 +02:00
parent 75dcf5dc5a
commit 7b900c12cd
1 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/ieee1394/dv1394.c
View File

@@ -1536,27 +1536,20 @@ static ssize_t dv1394_read(struct file *file, char __user *buffer, size_t count
static long dv1394_ioctl(struct file *file, unsigned int cmd, unsigned long arg) static long dv1394_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
{ {
struct video_card *video; struct video_card *video = file_to_video_card(file);
unsigned long flags; unsigned long flags;
int ret = -EINVAL; int ret = -EINVAL;
void __user *argp = (void __user *)arg; void __user *argp = (void __user *)arg;
DECLARE_WAITQUEUE(wait, current); DECLARE_WAITQUEUE(wait, current);
lock_kernel();
video = file_to_video_card(file);
/* serialize this to prevent multi-threaded mayhem */ /* serialize this to prevent multi-threaded mayhem */
if (file->f_flags & O_NONBLOCK) { if (file->f_flags & O_NONBLOCK) {
if (!mutex_trylock(&video->mtx)) { if (!mutex_trylock(&video->mtx))
unlock_kernel();
return -EAGAIN; return -EAGAIN;
}
} else { } else {
if (mutex_lock_interruptible(&video->mtx)) { if (mutex_lock_interruptible(&video->mtx))
unlock_kernel();
return -ERESTARTSYS; return -ERESTARTSYS;
}
} }
switch(cmd) switch(cmd)
@@ -1780,7 +1773,6 @@ static long dv1394_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
out: out:
mutex_unlock(&video->mtx); mutex_unlock(&video->mtx);
unlock_kernel();
return ret; return ret;
} }