Piteball/android_kernel_samsung_msm8976
1
1
Fork 0
mirror of https://github.com/team-infusion-developers/android_kernel_samsung_msm8976.git synced 2024-11-01 02:21:16 +00:00
Code Issues Projects Releases Wiki Activity

soundcore_open: Reduce the area BKL coverage

Browse source 
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>
This commit is contained in:
John Kacur 2010-07-04 00:02:31 +02:00 committed by Takashi Iwai
parent 65ee2ba310
commit 171d9f7d78
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
sound/sound_core.c
View file

@ -576,8 +576,6 @@ static int soundcore_open(struct inode *inode, struct file *file)
struct sound_unit *s; struct sound_unit *s;
const struct file_operations *new_fops = NULL; const struct file_operations *new_fops = NULL;
lock_kernel ();
chain=unit&0x0F; chain=unit&0x0F;
if(chain==4 || chain==5) /* dsp/audio/dsp16 */ 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; const struct file_operations *old_fops = file->f_op;
file->f_op = new_fops; file->f_op = new_fops;
spin_unlock(&sound_loader_lock); 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); err = file->f_op->open(inode,file);
unlock_kernel();
}
if (err) { if (err) {
fops_put(file->f_op); fops_put(file->f_op);
file->f_op = fops_get(old_fops); file->f_op = fops_get(old_fops);
} }
fops_put(old_fops); fops_put(old_fops);
unlock_kernel();
return err; return err;
} }
spin_unlock(&sound_loader_lock); spin_unlock(&sound_loader_lock);
unlock_kernel();
return -ENODEV; return -ENODEV;
} }