switch AF_PACKET and AF_UNIX to skb_copy_datagram_from_iter()

... and kill skb_copy_datagram_iovec()

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

1 files changed, 2 insertions, 86 deletions

diff --git a/net/core/datagram.c b/net/core/datagram.c
index c4d832efebb8..b6e303b0f01f 100644
--- a/net/core/datagram.c
+++ b/net/core/datagram.c
@@ -480,98 +480,14 @@ short_copy:
 EXPORT_SYMBOL(skb_copy_datagram_iter);
 
 /**
- *      skb_copy_datagram_from_iovec - Copy a datagram from an iovec.
+ *      skb_copy_datagram_from_iter - Copy a datagram from an iov_iter.
  *      @skb: buffer to copy
  *      @offset: offset in the buffer to start copying to
- *      @from: io vector to copy to
- *      @from_offset: offset in the io vector to start copying from
+ *      @from: the copy source
  *      @len: amount of data to copy to buffer from iovec
  *
  *      Returns 0 or -EFAULT.
- *      Note: the iovec is not modified during the copy.
  */
-int skb_copy_datagram_from_iovec(struct sk_buff *skb, int offset,
-                                 const struct iovec *from, int from_offset,
-                                 int len)
-{
-        int start = skb_headlen(skb);
-        int i, copy = start - offset;
-        struct sk_buff *frag_iter;
-
-        /* Copy header. */
-        if (copy > 0) {
-                if (copy > len)
-                        copy = len;
-                if (memcpy_fromiovecend(skb->data + offset, from, from_offset,
-                                        copy))
-                        goto fault;
-                if ((len -= copy) == 0)
-                        return 0;
-                offset += copy;
-                from_offset += copy;
-        }
-
-        /* Copy paged appendix. Hmm... why does this look so complicated? */
-        for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) {
-                int end;
-                const skb_frag_t *frag = &skb_shinfo(skb)->frags[i];
-
-                WARN_ON(start > offset + len);
-
-                end = start + skb_frag_size(frag);
-                if ((copy = end - offset) > 0) {
-                        int err;
-                        u8  *vaddr;
-                        struct page *page = skb_frag_page(frag);
-
-                        if (copy > len)
-                                copy = len;
-                        vaddr = kmap(page);
-                        err = memcpy_fromiovecend(vaddr + frag->page_offset +
-                                                  offset - start,
-                                                  from, from_offset, copy);
-                        kunmap(page);
-                        if (err)
-                                goto fault;
-
-                        if (!(len -= copy))
-                                return 0;
-                        offset += copy;
-                        from_offset += copy;
-                }
-                start = end;
-        }
-
-        skb_walk_frags(skb, frag_iter) {
-                int end;
-
-                WARN_ON(start > offset + len);
-
-                end = start + frag_iter->len;
-                if ((copy = end - offset) > 0) {
-                        if (copy > len)
-                                copy = len;
-                        if (skb_copy_datagram_from_iovec(frag_iter,
-                                                         offset - start,
-                                                         from,
-                                                         from_offset,
-                                                         copy))
-                                goto fault;
-                        if ((len -= copy) == 0)
-                                return 0;
-                        offset += copy;
-                        from_offset += copy;
-                }
-                start = end;
-        }
-        if (!len)
-                return 0;
-
-fault:
-        return -EFAULT;
-}
-EXPORT_SYMBOL(skb_copy_datagram_from_iovec);
-
 int skb_copy_datagram_from_iter(struct sk_buff *skb, int offset,
                                  struct iov_iter *from,
                                  int len)