diff options
| author | James Morris <james.l.morris@oracle.com> | 2012-09-27 23:37:32 -0400 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2012-09-27 23:37:32 -0400 |
| commit | bf5308344527d015ac9a6d2bda4ad4d40fd7d943 (patch) | |
| tree | 566e61e2cfc648c374d15cfc8c661b73e1a471f8 /net/unix/af_unix.c | |
| parent | 3585e96cd1049682b8a19a0b699422156e9d735b (diff) | |
| parent | 979570e02981d4a8fc20b3cc8fd651856c98ee9d (diff) | |
Merge tag 'v3.6-rc7' into next
Linux 3.6-rc7
Requested by David Howells so he can merge his key susbsystem work into
my tree with requisite -linus changesets.
Diffstat (limited to 'net/unix/af_unix.c')
| -rw-r--r-- | net/unix/af_unix.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c index e4768c180da2..c5ee4ff61364 100644 --- a/net/unix/af_unix.c +++ b/net/unix/af_unix.c | |||
| @@ -1450,7 +1450,7 @@ static int unix_dgram_sendmsg(struct kiocb *kiocb, struct socket *sock, | |||
| 1450 | if (NULL == siocb->scm) | 1450 | if (NULL == siocb->scm) |
| 1451 | siocb->scm = &tmp_scm; | 1451 | siocb->scm = &tmp_scm; |
| 1452 | wait_for_unix_gc(); | 1452 | wait_for_unix_gc(); |
| 1453 | err = scm_send(sock, msg, siocb->scm); | 1453 | err = scm_send(sock, msg, siocb->scm, false); |
| 1454 | if (err < 0) | 1454 | if (err < 0) |
| 1455 | return err; | 1455 | return err; |
| 1456 | 1456 | ||
| @@ -1619,7 +1619,7 @@ static int unix_stream_sendmsg(struct kiocb *kiocb, struct socket *sock, | |||
| 1619 | if (NULL == siocb->scm) | 1619 | if (NULL == siocb->scm) |
| 1620 | siocb->scm = &tmp_scm; | 1620 | siocb->scm = &tmp_scm; |
| 1621 | wait_for_unix_gc(); | 1621 | wait_for_unix_gc(); |
| 1622 | err = scm_send(sock, msg, siocb->scm); | 1622 | err = scm_send(sock, msg, siocb->scm, false); |
| 1623 | if (err < 0) | 1623 | if (err < 0) |
| 1624 | return err; | 1624 | return err; |
| 1625 | 1625 | ||