summaryrefslogtreecommitdiffstats
path: root/sound/sound_core.c
diff options
context:
space:
mode:
authorJohn Kacur <jkacur@redhat.com>2010-07-04 00:02:31 +0200
committerTakashi Iwai <tiwai@suse.de>2010-07-05 18:07:30 +0200
commit171d9f7d786681e76bb289d01d8f897cbc50de57 (patch)
tree5d05843426e6e3a95b9744e43d96586bc2ab5c06 /sound/sound_core.c
parent65ee2ba3105f6ca3b8814d993682d4f21a1f0d8d (diff)
downloadlinux-171d9f7d786681e76bb289d01d8f897cbc50de57.tar.bz2
soundcore_open: Reduce the area BKL coverage
Most of this function is protected by the sound_loader_lock. We can push down the BKL to this call out err = file->f_op->open(inode,file); In order to build the sound core without the BKL, we will need to push the lock_kernel() call into the ~20 device drivers that register their file operations. Signed-off-by: John Kacur <jkacur@redhat.com> Signed-off-by: Arnd Bergmann <arnd@arndb.de> Acked-by: Alan Cox <alan@linux.intel.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/sound_core.c')
-rw-r--r--sound/sound_core.c13
1 files changed, 8 insertions, 5 deletions
diff --git a/sound/sound_core.c b/sound/sound_core.c
index 7c2d677a2df5..c8627fcd4900 100644
--- a/sound/sound_core.c
+++ b/sound/sound_core.c
@@ -576,8 +576,6 @@ static int soundcore_open(struct inode *inode, struct file *file)
struct sound_unit *s;
const struct file_operations *new_fops = NULL;
- lock_kernel ();
-
chain=unit&0x0F;
if(chain==4 || chain==5) /* dsp/audio/dsp16 */
{
@@ -630,18 +628,23 @@ static int soundcore_open(struct inode *inode, struct file *file)
const struct file_operations *old_fops = file->f_op;
file->f_op = new_fops;
spin_unlock(&sound_loader_lock);
- if(file->f_op->open)
+
+ if (file->f_op->open) {
+ /* TODO: push down BKL into indivial open functions */
+ lock_kernel();
err = file->f_op->open(inode,file);
+ unlock_kernel();
+ }
+
if (err) {
fops_put(file->f_op);
file->f_op = fops_get(old_fops);
}
+
fops_put(old_fops);
- unlock_kernel();
return err;
}
spin_unlock(&sound_loader_lock);
- unlock_kernel();
return -ENODEV;
}