aboutsummaryrefslogtreecommitdiffstats
path: root/net/unix
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2014-11-05 16:46:40 -0500
committerDavid S. Miller <davem@davemloft.net>2014-11-05 16:46:40 -0500
commit51f3d02b980a338cd291d2bc7629cdfb2568424b (patch)
treef49898ea87db3d5e3f5c248ab21f6ed0a70785b8 /net/unix
parent1d76c1d028975df8488d1ae18a76f268eb5efa93 (diff)
net: Add and use skb_copy_datagram_msg() helper.
This encapsulates all of the skb_copy_datagram_iovec() callers with call argument signature "skb, offset, msghdr->msg_iov, length". When we move to iov_iters in the networking, the iov_iter object will sit in the msghdr. Having a helper like this means there will be less places to touch during that transformation. Based upon descriptions and patch from Al Viro. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/unix')
-rw-r--r--net/unix/af_unix.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c
index e96884380732..5eee625d113f 100644
--- a/net/unix/af_unix.c
+++ b/net/unix/af_unix.c
@@ -1825,7 +1825,7 @@ static int unix_dgram_recvmsg(struct kiocb *iocb, struct socket *sock,
1825 else if (size < skb->len - skip) 1825 else if (size < skb->len - skip)
1826 msg->msg_flags |= MSG_TRUNC; 1826 msg->msg_flags |= MSG_TRUNC;
1827 1827
1828 err = skb_copy_datagram_iovec(skb, skip, msg->msg_iov, size); 1828 err = skb_copy_datagram_msg(skb, skip, msg, size);
1829 if (err) 1829 if (err)
1830 goto out_free; 1830 goto out_free;
1831 1831
@@ -2030,8 +2030,8 @@ again:
2030 } 2030 }
2031 2031
2032 chunk = min_t(unsigned int, unix_skb_len(skb) - skip, size); 2032 chunk = min_t(unsigned int, unix_skb_len(skb) - skip, size);
2033 if (skb_copy_datagram_iovec(skb, UNIXCB(skb).consumed + skip, 2033 if (skb_copy_datagram_msg(skb, UNIXCB(skb).consumed + skip,
2034 msg->msg_iov, chunk)) { 2034 msg, chunk)) {
2035 if (copied == 0) 2035 if (copied == 0)
2036 copied = -EFAULT; 2036 copied = -EFAULT;
2037 break; 2037 break;