diff options
| author | Ingo Molnar <[email protected]> | 2008-12-12 10:59:39 +0000 |
|---|---|---|
| committer | Ingo Molnar <[email protected]> | 2008-12-12 10:59:39 +0000 |
| commit | fd10902797fc9d6abaf55d9c2e3c6698c90b10c7 (patch) | |
| tree | 0bc15b8b967e6f0973387e7c81f5b0dc9ce44e75 /net/unix/af_unix.c | |
| parent | x86: ret_from_fork - get rid of jump back (diff) | |
| parent | Linux 2.6.28-rc8 (diff) | |
| download | kernel-fd10902797fc9d6abaf55d9c2e3c6698c90b10c7.tar.gz kernel-fd10902797fc9d6abaf55d9c2e3c6698c90b10c7.zip | |
Merge commit 'v2.6.28-rc8' into x86/irq
Diffstat (limited to 'net/unix/af_unix.c')
| -rw-r--r-- | net/unix/af_unix.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c index eb90f77bb0e2..66d5ac4773ab 100644 --- a/net/unix/af_unix.c +++ b/net/unix/af_unix.c @@ -1343,6 +1343,7 @@ static int unix_dgram_sendmsg(struct kiocb *kiocb, struct socket *sock, if (NULL == siocb->scm) siocb->scm = &tmp_scm; + wait_for_unix_gc(); err = scm_send(sock, msg, siocb->scm); if (err < 0) return err; @@ -1493,6 +1494,7 @@ static int unix_stream_sendmsg(struct kiocb *kiocb, struct socket *sock, if (NULL == siocb->scm) siocb->scm = &tmp_scm; + wait_for_unix_gc(); err = scm_send(sock, msg, siocb->scm); if (err < 0) return err; |