summaryrefslogtreecommitdiffstats
path: root/sound/core/oss
diff options
context:
space:
mode:
authorJonathan Corbet <corbet@lwn.net>2009-02-06 15:25:24 -0700
committerJonathan Corbet <corbet@lwn.net>2009-03-16 08:32:27 -0600
commitdb1dd4d376134eba0e08af523b61cc566a4ea1cd (patch)
tree8882c673abbaa5713511b7046493fa862b9140d1 /sound/core/oss
parent684999149002dd046269666a390458e0acb38280 (diff)
downloadop-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/core/oss')
-rw-r--r--sound/core/oss/pcm_oss.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/core/oss/pcm_oss.c b/sound/core/oss/pcm_oss.c
index 0a1798e..d4460f1 100644
--- a/sound/core/oss/pcm_oss.c
+++ b/sound/core/oss/pcm_oss.c
@@ -1895,7 +1895,9 @@ static int snd_pcm_oss_set_fragment(struct snd_pcm_oss_file *pcm_oss_file, unsig
static int snd_pcm_oss_nonblock(struct file * file)
{
+ spin_lock(&file->f_lock);
file->f_flags |= O_NONBLOCK;
+ spin_unlock(&file->f_lock);
return 0;
}
OpenPOWER on IntegriCloud