diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-26 16:14:02 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-26 16:14:02 -0700 |
| commit | 8e9d2089723d08d51e66c5eea49253d76e27941e (patch) | |
| tree | cf15609d5eeb0c1f3a39231d8ce793d3c8ad0ed0 /ipc | |
| parent | ba1eb95cf3cc666769afe42eaa15a3a34ae82f94 (diff) | |
| parent | 60aa49243d09afc873f082567d2e3c16634ced84 (diff) | |
| download | blackbird-op-linux-8e9d2089723d08d51e66c5eea49253d76e27941e.tar.gz blackbird-op-linux-8e9d2089723d08d51e66c5eea49253d76e27941e.zip | |
Merge branch 'bkl-removal' of git://git.lwn.net/linux-2.6
* 'bkl-removal' of git://git.lwn.net/linux-2.6:
Rationalize fasync return values
Move FASYNC bit handling to f_op->fasync()
Use f_lock to protect f_flags
Rename struct file->f_ep_lock
Diffstat (limited to 'ipc')
| -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, omqstat.mq_flags = filp->f_flags & O_NONBLOCK; if (u_mqstat) { audit_mq_getsetattr(mqdes, &mqstat); + spin_lock(&filp->f_lock); if (mqstat.mq_flags & O_NONBLOCK) filp->f_flags |= O_NONBLOCK; else filp->f_flags &= ~O_NONBLOCK; + spin_unlock(&filp->f_lock); inode->i_atime = inode->i_ctime = CURRENT_TIME; } |
