Merge branch 'for-davem-2' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

More iov_iter work for the networking from Al Viro.

Signed-off-by: David S. Miller <davem@davemloft.net>

2 files changed, 3 insertions, 30 deletions

diff --git a/include/net/bluetooth/l2cap.h b/include/net/bluetooth/l2cap.h
index eee3ef530e79..d1bb342d083f 100644
--- a/include/net/bluetooth/l2cap.h
+++ b/include/net/bluetooth/l2cap.h
@@ -608,10 +608,6 @@ struct l2cap_ops {
         struct sk_buff          *(*alloc_skb) (struct l2cap_chan *chan,
                                                unsigned long hdr_len,
                                                unsigned long len, int nb);
-        int                     (*memcpy_fromiovec) (struct l2cap_chan *chan,
-                                                     unsigned char *kdata,
-                                                     struct iovec *iov,
-                                                     int len);
 };
 
 struct l2cap_conn {
@@ -905,31 +901,6 @@ static inline long l2cap_chan_no_get_sndtimeo(struct l2cap_chan *chan)
         return 0;
 }
 
-static inline int l2cap_chan_no_memcpy_fromiovec(struct l2cap_chan *chan,
-                                                 unsigned char *kdata,
-                                                 struct iovec *iov,
-                                                 int len)
-{
-        /* Following is safe since for compiler definitions of kvec and
-         * iovec are identical, yielding the same in-core layout and alignment
-         */
-        struct kvec *vec = (struct kvec *)iov;
-
-        while (len > 0) {
-                if (vec->iov_len) {
-                        int copy = min_t(unsigned int, len, vec->iov_len);
-                        memcpy(kdata, vec->iov_base, copy);
-                        len -= copy;
-                        kdata += copy;
-                        vec->iov_base += copy;
-                        vec->iov_len -= copy;
-                }
-                vec++;
-        }
-
-        return 0;
-}
-
 extern bool disable_ertm;
 
 int l2cap_init_sockets(void);
diff --git a/include/net/udplite.h b/include/net/udplite.h
index 9a28a5179400..ae7c8d1fbcad 100644
--- a/include/net/udplite.h
+++ b/include/net/udplite.h
@@ -19,7 +19,9 @@ extern struct udp_table		udplite_table;
 static __inline__ int udplite_getfrag(void *from, char *to, int  offset,
                                       int len, int odd, struct sk_buff *skb)
 {
-        return memcpy_fromiovecend(to, (struct iovec *) from, offset, len);
+        struct msghdr *msg = from;
+        /* XXX: stripping const */
+        return memcpy_fromiovecend(to, (struct iovec *)msg->msg_iter.iov, offset, len);
 }
 
 /* Designate sk as UDP-Lite socket */