aboutsummaryrefslogtreecommitdiffstats
path: root/sound/core
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-07-14 17:48:31 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2008-07-14 17:48:31 -0400
commitd1794f2c5b5817eb79ccc5e00701ca748d1b073a (patch)
tree5a4c98e694e88a8c82f342d0cc9edb2a4cbbef36 /sound/core
parenta41eebab7537890409ea9dfe0fcda9b5fbdb090d (diff)
parent2fceef397f9880b212a74c418290ce69e7ac00eb (diff)
Merge branch 'bkl-removal' of git://git.lwn.net/linux-2.6
* 'bkl-removal' of git://git.lwn.net/linux-2.6: (146 commits) IB/umad: BKL is not needed for ib_umad_open() IB/uverbs: BKL is not needed for ib_uverbs_open() bf561-coreb: BKL unneeded for open() Call fasync() functions without the BKL snd/PCM: fasync BKL pushdown ipmi: fasync BKL pushdown ecryptfs: fasync BKL pushdown Bluetooth VHCI: fasync BKL pushdown tty_io: fasync BKL pushdown tun: fasync BKL pushdown i2o: fasync BKL pushdown mpt: fasync BKL pushdown Remove BKL from remote_llseek v2 Make FAT users happier by not deadlocking x86-mce: BKL pushdown vmwatchdog: BKL pushdown vmcp: BKL pushdown via-pmu: BKL pushdown uml-random: BKL pushdown uml-mmapper: BKL pushdown ...
Diffstat (limited to 'sound/core')
-rw-r--r--sound/core/pcm_native.c8
-rw-r--r--sound/core/sound.c15
2 files changed, 20 insertions, 3 deletions
diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c
index 61f5d425b630..c49b9d9e303c 100644
--- a/sound/core/pcm_native.c
+++ b/sound/core/pcm_native.c
@@ -22,6 +22,7 @@
22#include <linux/mm.h> 22#include <linux/mm.h>
23#include <linux/file.h> 23#include <linux/file.h>
24#include <linux/slab.h> 24#include <linux/slab.h>
25#include <linux/smp_lock.h>
25#include <linux/time.h> 26#include <linux/time.h>
26#include <linux/pm_qos_params.h> 27#include <linux/pm_qos_params.h>
27#include <linux/uio.h> 28#include <linux/uio.h>
@@ -3249,14 +3250,17 @@ static int snd_pcm_fasync(int fd, struct file * file, int on)
3249 struct snd_pcm_file * pcm_file; 3250 struct snd_pcm_file * pcm_file;
3250 struct snd_pcm_substream *substream; 3251 struct snd_pcm_substream *substream;
3251 struct snd_pcm_runtime *runtime; 3252 struct snd_pcm_runtime *runtime;
3252 int err; 3253 int err = -ENXIO;
3253 3254
3255 lock_kernel();
3254 pcm_file = file->private_data; 3256 pcm_file = file->private_data;
3255 substream = pcm_file->substream; 3257 substream = pcm_file->substream;
3256 snd_assert(substream != NULL, return -ENXIO); 3258 snd_assert(substream != NULL, goto out);
3257 runtime = substream->runtime; 3259 runtime = substream->runtime;
3258 3260
3259 err = fasync_helper(fd, file, on, &runtime->fasync); 3261 err = fasync_helper(fd, file, on, &runtime->fasync);
3262out:
3263 unlock_kernel();
3260 if (err < 0) 3264 if (err < 0)
3261 return err; 3265 return err;
3262 return 0; 3266 return 0;
diff --git a/sound/core/sound.c b/sound/core/sound.c
index 09a94953745a..1003ae375d47 100644
--- a/sound/core/sound.c
+++ b/sound/core/sound.c
@@ -21,6 +21,7 @@
21 21
22#include <linux/init.h> 22#include <linux/init.h>
23#include <linux/slab.h> 23#include <linux/slab.h>
24#include <linux/smp_lock.h>
24#include <linux/time.h> 25#include <linux/time.h>
25#include <linux/device.h> 26#include <linux/device.h>
26#include <linux/moduleparam.h> 27#include <linux/moduleparam.h>
@@ -121,7 +122,7 @@ void *snd_lookup_minor_data(unsigned int minor, int type)
121 122
122EXPORT_SYMBOL(snd_lookup_minor_data); 123EXPORT_SYMBOL(snd_lookup_minor_data);
123 124
124static int snd_open(struct inode *inode, struct file *file) 125static int __snd_open(struct inode *inode, struct file *file)
125{ 126{
126 unsigned int minor = iminor(inode); 127 unsigned int minor = iminor(inode);
127 struct snd_minor *mptr = NULL; 128 struct snd_minor *mptr = NULL;
@@ -163,6 +164,18 @@ static int snd_open(struct inode *inode, struct file *file)
163 return err; 164 return err;
164} 165}
165 166
167
168/* BKL pushdown: nasty #ifdef avoidance wrapper */
169static int snd_open(struct inode *inode, struct file *file)
170{
171 int ret;
172
173 lock_kernel();
174 ret = __snd_open(inode, file);
175 unlock_kernel();
176 return ret;
177}
178
166static const struct file_operations snd_fops = 179static const struct file_operations snd_fops =
167{ 180{
168 .owner = THIS_MODULE, 181 .owner = THIS_MODULE,