diff options
| author | Ingo Molnar <[email protected]> | 2008-12-12 09:29:35 +0000 |
|---|---|---|
| committer | Ingo Molnar <[email protected]> | 2008-12-12 09:29:35 +0000 |
| commit | c1dfdc7597d051b09555d4ae2acb90403e238746 (patch) | |
| tree | 86aa49f5a2ab25459f9196dd6724bbe6645b1375 /net/unix/af_unix.c | |
| parent | sched: idle_balance() does not call load_balance_newidle() (diff) | |
| parent | Linux 2.6.28-rc8 (diff) | |
| download | kernel-c1dfdc7597d051b09555d4ae2acb90403e238746.tar.gz kernel-c1dfdc7597d051b09555d4ae2acb90403e238746.zip | |
Merge commit 'v2.6.28-rc8' into sched/core
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; |