diff options
author | Jonathan Corbet <corbet@lwn.net> | 2009-02-06 17:25:24 -0500 |
---|---|---|
committer | Jonathan Corbet <corbet@lwn.net> | 2009-03-16 10:32:27 -0400 |
commit | db1dd4d376134eba0e08af523b61cc566a4ea1cd (patch) | |
tree | 8882c673abbaa5713511b7046493fa862b9140d1 /sound/oss/sh_dac_audio.c | |
parent | 684999149002dd046269666a390458e0acb38280 (diff) |
Use f_lock to protect f_flags
Traditionally, changes to struct file->f_flags have been done under BKL
protection, or with no protection at all. This patch causes all f_flags
changes after file open/creation time to be done under protection of
f_lock. This allows the removal of some BKL usage and fixes a number of
longstanding (if microscopic) races.
Reviewed-by: Christoph Hellwig <hch@lst.de>
Cc: Al Viro <viro@ZenIV.linux.org.uk>
Signed-off-by: Jonathan Corbet <corbet@lwn.net>
Diffstat (limited to 'sound/oss/sh_dac_audio.c')
-rw-r--r-- | sound/oss/sh_dac_audio.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/oss/sh_dac_audio.c b/sound/oss/sh_dac_audio.c index e5d423994918..78cfb66e4c59 100644 --- a/sound/oss/sh_dac_audio.c +++ b/sound/oss/sh_dac_audio.c | |||
@@ -135,7 +135,9 @@ static int dac_audio_ioctl(struct inode *inode, struct file *file, | |||
135 | return put_user(AFMT_U8, (int *)arg); | 135 | return put_user(AFMT_U8, (int *)arg); |
136 | 136 | ||
137 | case SNDCTL_DSP_NONBLOCK: | 137 | case SNDCTL_DSP_NONBLOCK: |
138 | spin_lock(&file->f_lock); | ||
138 | file->f_flags |= O_NONBLOCK; | 139 | file->f_flags |= O_NONBLOCK; |
140 | spin_unlock(&file->f_lock); | ||
139 | return 0; | 141 | return 0; |
140 | 142 | ||
141 | case SNDCTL_DSP_GETCAPS: | 143 | case SNDCTL_DSP_GETCAPS: |