diff options
| author | David S. Miller <davem@davemloft.net> | 2014-11-05 22:46:40 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-11-05 22:46:40 +0100 |
| commit | 51f3d02b980a338cd291d2bc7629cdfb2568424b (patch) | |
| tree | f49898ea87db3d5e3f5c248ab21f6ed0a70785b8 /net/tipc/socket.c | |
| parent | Merge branch 'gue-next' (diff) | |
| download | linux-51f3d02b980a338cd291d2bc7629cdfb2568424b.tar.xz linux-51f3d02b980a338cd291d2bc7629cdfb2568424b.zip | |
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/tipc/socket.c')
| -rw-r--r-- | net/tipc/socket.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/net/tipc/socket.c b/net/tipc/socket.c index ad8a1a1e2275..591bbfa082a0 100644 --- a/net/tipc/socket.c +++ b/net/tipc/socket.c @@ -1372,8 +1372,7 @@ restart: sz = buf_len; m->msg_flags |= MSG_TRUNC; } - res = skb_copy_datagram_iovec(buf, msg_hdr_sz(msg), - m->msg_iov, sz); + res = skb_copy_datagram_msg(buf, msg_hdr_sz(msg), m, sz); if (res) goto exit; res = sz; @@ -1473,8 +1472,8 @@ restart: needed = (buf_len - sz_copied); sz_to_copy = (sz <= needed) ? sz : needed; - res = skb_copy_datagram_iovec(buf, msg_hdr_sz(msg) + offset, - m->msg_iov, sz_to_copy); + res = skb_copy_datagram_msg(buf, msg_hdr_sz(msg) + offset, + m, sz_to_copy); if (res) goto exit; |