diff options
| author | Jonathan Corbet <corbet@lwn.net> | 2009-02-06 15:25:24 -0700 |
|---|---|---|
| committer | Jonathan Corbet <corbet@lwn.net> | 2009-03-16 08:32:27 -0600 |
| commit | db1dd4d376134eba0e08af523b61cc566a4ea1cd (patch) | |
| tree | 8882c673abbaa5713511b7046493fa862b9140d1 /sound/oss/audio.c | |
| parent | 684999149002dd046269666a390458e0acb38280 (diff) | |
| download | op-kernel-dev-db1dd4d376134eba0e08af523b61cc566a4ea1cd.zip op-kernel-dev-db1dd4d376134eba0e08af523b61cc566a4ea1cd.tar.gz | |
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/audio.c')
| -rw-r--r-- | sound/oss/audio.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/oss/audio.c b/sound/oss/audio.c index 89bd27a..b69c05b 100644 --- a/sound/oss/audio.c +++ b/sound/oss/audio.c @@ -433,7 +433,9 @@ int audio_ioctl(int dev, struct file *file, unsigned int cmd, void __user *arg) return dma_ioctl(dev, cmd, arg); case SNDCTL_DSP_NONBLOCK: + spin_lock(&file->f_lock); file->f_flags |= O_NONBLOCK; + spin_unlock(&file->f_lock); return 0; case SNDCTL_DSP_GETCAPS: |
