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/vwsnd.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/vwsnd.c')
-rw-r--r-- | sound/oss/vwsnd.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/oss/vwsnd.c b/sound/oss/vwsnd.c index 78b8acc7c3b9..187f72750e8f 100644 --- a/sound/oss/vwsnd.c +++ b/sound/oss/vwsnd.c | |||
@@ -2673,7 +2673,9 @@ static int vwsnd_audio_do_ioctl(struct inode *inode, | |||
2673 | 2673 | ||
2674 | case SNDCTL_DSP_NONBLOCK: /* _SIO ('P',14) */ | 2674 | case SNDCTL_DSP_NONBLOCK: /* _SIO ('P',14) */ |
2675 | DBGX("SNDCTL_DSP_NONBLOCK\n"); | 2675 | DBGX("SNDCTL_DSP_NONBLOCK\n"); |
2676 | spin_lock(&file->f_lock); | ||
2676 | file->f_flags |= O_NONBLOCK; | 2677 | file->f_flags |= O_NONBLOCK; |
2678 | spin_unlock(&file->f_lock); | ||
2677 | return 0; | 2679 | return 0; |
2678 | 2680 | ||
2679 | case SNDCTL_DSP_RESET: /* _SIO ('P', 0) */ | 2681 | case SNDCTL_DSP_RESET: /* _SIO ('P', 0) */ |