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 /ipc/mqueue.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 'ipc/mqueue.c')
-rw-r--r-- | ipc/mqueue.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ipc/mqueue.c b/ipc/mqueue.c index 54b4077fed79..a8ddadbc7459 100644 --- a/ipc/mqueue.c +++ b/ipc/mqueue.c | |||
@@ -1156,10 +1156,12 @@ SYSCALL_DEFINE3(mq_getsetattr, mqd_t, mqdes, | |||
1156 | omqstat.mq_flags = filp->f_flags & O_NONBLOCK; | 1156 | omqstat.mq_flags = filp->f_flags & O_NONBLOCK; |
1157 | if (u_mqstat) { | 1157 | if (u_mqstat) { |
1158 | audit_mq_getsetattr(mqdes, &mqstat); | 1158 | audit_mq_getsetattr(mqdes, &mqstat); |
1159 | spin_lock(&filp->f_lock); | ||
1159 | if (mqstat.mq_flags & O_NONBLOCK) | 1160 | if (mqstat.mq_flags & O_NONBLOCK) |
1160 | filp->f_flags |= O_NONBLOCK; | 1161 | filp->f_flags |= O_NONBLOCK; |
1161 | else | 1162 | else |
1162 | filp->f_flags &= ~O_NONBLOCK; | 1163 | filp->f_flags &= ~O_NONBLOCK; |
1164 | spin_unlock(&filp->f_lock); | ||
1163 | 1165 | ||
1164 | inode->i_atime = inode->i_ctime = CURRENT_TIME; | 1166 | inode->i_atime = inode->i_ctime = CURRENT_TIME; |
1165 | } | 1167 | } |