diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-12-12 12:43:05 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-12-12 12:43:05 +0100 |
| commit | 81444a799550214f549caf579cf65a0ca55e70b7 (patch) | |
| tree | 3288dac0740be2e1e7d1af4ee51d792a6e91edf3 /net/unix/af_unix.c | |
| parent | a64d31baed104be25305e9c71585d3ea4ee9a418 (diff) | |
| parent | da485e0cb16726797e99a595a399b9fc721b91bc (diff) | |
Merge branch 'tracing/fastboot' into cpus4096
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; |