aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorJes Sorensen <jes@sgi.com>2006-01-09 18:59:24 -0500
committerIngo Molnar <mingo@hera.kernel.org>2006-01-09 18:59:24 -0500
commit1b1dcc1b57a49136f118a0f16367256ff9994a69 (patch)
treeb0b36d4f41d28c9d6514fb309d33c1a084d6309b /sound
parent794ee1baee1c26be40410233e6c20bceb2b03c08 (diff)
[PATCH] mutex subsystem, semaphore to mutex: VFS, ->i_sem
This patch converts the inode semaphore to a mutex. I have tested it on XFS and compiled as much as one can consider on an ia64. Anyway your luck with it might be different. Modified-by: Ingo Molnar <mingo@elte.hu> (finished the conversion) Signed-off-by: Jes Sorensen <jes@sgi.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'sound')
-rw-r--r--sound/core/oss/pcm_oss.c2
-rw-r--r--sound/core/seq/seq_memory.c4
2 files changed, 0 insertions, 6 deletions
diff --git a/sound/core/oss/pcm_oss.c b/sound/core/oss/pcm_oss.c
index 16df1246a131..7fd072392c7e 100644
--- a/sound/core/oss/pcm_oss.c
+++ b/sound/core/oss/pcm_oss.c
@@ -2135,9 +2135,7 @@ static ssize_t snd_pcm_oss_write(struct file *file, const char __user *buf, size
2135 substream = pcm_oss_file->streams[SNDRV_PCM_STREAM_PLAYBACK]; 2135 substream = pcm_oss_file->streams[SNDRV_PCM_STREAM_PLAYBACK];
2136 if (substream == NULL) 2136 if (substream == NULL)
2137 return -ENXIO; 2137 return -ENXIO;
2138 up(&file->f_dentry->d_inode->i_sem);
2139 result = snd_pcm_oss_write1(substream, buf, count); 2138 result = snd_pcm_oss_write1(substream, buf, count);
2140 down(&file->f_dentry->d_inode->i_sem);
2141#ifdef OSS_DEBUG 2139#ifdef OSS_DEBUG
2142 printk("pcm_oss: write %li bytes (wrote %li bytes)\n", (long)count, (long)result); 2140 printk("pcm_oss: write %li bytes (wrote %li bytes)\n", (long)count, (long)result);
2143#endif 2141#endif
diff --git a/sound/core/seq/seq_memory.c b/sound/core/seq/seq_memory.c
index 9ee6c177db0c..40b4f679c80e 100644
--- a/sound/core/seq/seq_memory.c
+++ b/sound/core/seq/seq_memory.c
@@ -32,10 +32,6 @@
32#include "seq_info.h" 32#include "seq_info.h"
33#include "seq_lock.h" 33#include "seq_lock.h"
34 34
35/* semaphore in struct file record */
36#define semaphore_of(fp) ((fp)->f_dentry->d_inode->i_sem)
37
38
39static inline int snd_seq_pool_available(struct snd_seq_pool *pool) 35static inline int snd_seq_pool_available(struct snd_seq_pool *pool)
40{ 36{
41 return pool->total_elements - atomic_read(&pool->counter); 37 return pool->total_elements - atomic_read(&pool->counter);