summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2009-03-20 12:24:30 +1100
committerStephen Rothwell <sfr@canb.auug.org.au>2009-03-20 12:24:30 +1100
commit24a4e10a65642ebf64c1614d4e3f516c86da15b8 (patch)
treec2124f517b95ebf904cb466340f39a12047a8e21 /net
parent20bc96b8022f8d899fb5b0ed5b3e868cea966279 (diff)
parent60aa49243d09afc873f082567d2e3c16634ced84 (diff)
Merge commit 'bkl-removal/bkl-removal'
Diffstat (limited to 'net')
-rw-r--r--net/socket.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/net/socket.c b/net/socket.c
index 47a3dc074eb0..af0205ff56f2 100644
--- 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)