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>
This commit is contained in:
@@ -1825,7 +1825,7 @@ static int unix_dgram_recvmsg(struct kiocb *iocb, struct socket *sock,
|
||||
else if (size < skb->len - skip)
|
||||
msg->msg_flags |= MSG_TRUNC;
|
||||
|
||||
err = skb_copy_datagram_iovec(skb, skip, msg->msg_iov, size);
|
||||
err = skb_copy_datagram_msg(skb, skip, msg, size);
|
||||
if (err)
|
||||
goto out_free;
|
||||
|
||||
@@ -2030,8 +2030,8 @@ again:
|
||||
}
|
||||
|
||||
chunk = min_t(unsigned int, unix_skb_len(skb) - skip, size);
|
||||
if (skb_copy_datagram_iovec(skb, UNIXCB(skb).consumed + skip,
|
||||
msg->msg_iov, chunk)) {
|
||||
if (skb_copy_datagram_msg(skb, UNIXCB(skb).consumed + skip,
|
||||
msg, chunk)) {
|
||||
if (copied == 0)
|
||||
copied = -EFAULT;
|
||||
break;
|
||||
|
Reference in New Issue
Block a user