git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'bkl-removal' of git://git.lwn.net/linux-2.6
[pandora-kernel.git]
/
net
/
socket.c
diff --git
a/net/socket.c
b/net/socket.c
index
47a3dc0
..
af0205f
100644
(file)
--- a/
net/socket.c
+++ b/
net/socket.c
@@
-1074,6
+1074,13
@@
static int sock_fasync(int fd, struct file *filp, int on)
lock_sock(sk);
+ spin_lock(&filp->f_lock);
+ if (on)
+ filp->f_flags |= FASYNC;
+ else
+ filp->f_flags &= ~FASYNC;
+ spin_unlock(&filp->f_lock);
+
prev = &(sock->fasync_list);
for (fa = *prev; fa != NULL; prev = &fa->fa_next, fa = *prev)