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/au1550_ac97.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/au1550_ac97.c')
-rw-r--r-- | sound/oss/au1550_ac97.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/oss/au1550_ac97.c b/sound/oss/au1550_ac97.c index 81e1f443d094..4191acccbcdb 100644 --- a/sound/oss/au1550_ac97.c +++ b/sound/oss/au1550_ac97.c | |||
@@ -1627,7 +1627,9 @@ au1550_ioctl(struct inode *inode, struct file *file, unsigned int cmd, | |||
1627 | sizeof(abinfo)) ? -EFAULT : 0; | 1627 | sizeof(abinfo)) ? -EFAULT : 0; |
1628 | 1628 | ||
1629 | case SNDCTL_DSP_NONBLOCK: | 1629 | case SNDCTL_DSP_NONBLOCK: |
1630 | spin_lock(&file->f_lock); | ||
1630 | file->f_flags |= O_NONBLOCK; | 1631 | file->f_flags |= O_NONBLOCK; |
1632 | spin_unlock(&file->f_lock); | ||
1631 | return 0; | 1633 | return 0; |
1632 | 1634 | ||
1633 | case SNDCTL_DSP_GETODELAY: | 1635 | case SNDCTL_DSP_GETODELAY: |