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>

5 files changed, 8 insertions, 23 deletions

diff --git a/net/bluetooth/6lowpan.c b/net/bluetooth/6lowpan.c
index bdcaefd2db12..76617be1e797 100644
--- a/net/bluetooth/6lowpan.c
+++ b/net/bluetooth/6lowpan.c
@@ -537,12 +537,12 @@ static int send_pkt(struct l2cap_chan *chan, struct sk_buff *skb,
          */
         chan->data = skb;
 
-        memset(&msg, 0, sizeof(msg));
-        msg.msg_iov = (struct iovec *) &iv;
-        msg.msg_iovlen = 1;
         iv.iov_base = skb->data;
         iv.iov_len = skb->len;
 
+        memset(&msg, 0, sizeof(msg));
+        iov_iter_kvec(&msg.msg_iter, WRITE | ITER_KVEC, &iv, 1, skb->len);
+
         err = l2cap_chan_send(chan, &msg, skb->len);
         if (err > 0) {
                 netdev->stats.tx_bytes += err;
@@ -1050,7 +1050,6 @@ static const struct l2cap_ops bt_6lowpan_chan_ops = {
         .suspend                = chan_suspend_cb,
         .get_sndtimeo           = chan_get_sndtimeo_cb,
         .alloc_skb              = chan_alloc_skb_cb,
-        .memcpy_fromiovec       = l2cap_chan_no_memcpy_fromiovec,
 
         .teardown               = l2cap_chan_no_teardown,
         .defer                  = l2cap_chan_no_defer,
diff --git a/net/bluetooth/a2mp.c b/net/bluetooth/a2mp.c
index 5dcade511fdb..cedfbda15dad 100644
--- a/net/bluetooth/a2mp.c
+++ b/net/bluetooth/a2mp.c
@@ -60,8 +60,7 @@ void a2mp_send(struct amp_mgr *mgr, u8 code, u8 ident, u16 len, void *data)
 
         memset(&msg, 0, sizeof(msg));
 
-        msg.msg_iov = (struct iovec *) &iv;
-        msg.msg_iovlen = 1;
+        iov_iter_kvec(&msg.msg_iter, WRITE | ITER_KVEC, &iv, 1, total_len);
 
         l2cap_chan_send(chan, &msg, total_len);
 
@@ -720,7 +719,6 @@ static const struct l2cap_ops a2mp_chan_ops = {
         .resume = l2cap_chan_no_resume,
         .set_shutdown = l2cap_chan_no_set_shutdown,
         .get_sndtimeo = l2cap_chan_no_get_sndtimeo,
-        .memcpy_fromiovec = l2cap_chan_no_memcpy_fromiovec,
 };
 
 static struct l2cap_chan *a2mp_chan_open(struct l2cap_conn *conn, bool locked)
diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
index a8da7ea9c2c0..a2b6dfa38a0c 100644
--- a/net/bluetooth/l2cap_core.c
+++ b/net/bluetooth/l2cap_core.c
@@ -2103,8 +2103,7 @@ static inline int l2cap_skbuff_fromiovec(struct l2cap_chan *chan,
         struct sk_buff **frag;
         int sent = 0;
 
-        if (chan->ops->memcpy_fromiovec(chan, skb_put(skb, count),
-                                        msg->msg_iov, count))
+        if (copy_from_iter(skb_put(skb, count), count, &msg->msg_iter) != count)
                 return -EFAULT;
 
         sent += count;
@@ -2124,8 +2123,8 @@ static inline int l2cap_skbuff_fromiovec(struct l2cap_chan *chan,
 
                 *frag = tmp;
 
-                if (chan->ops->memcpy_fromiovec(chan, skb_put(*frag, count),
-                                                msg->msg_iov, count))
+                if (copy_from_iter(skb_put(*frag, count), count,
+                                   &msg->msg_iter) != count)
                         return -EFAULT;
 
                 sent += count;
diff --git a/net/bluetooth/l2cap_sock.c b/net/bluetooth/l2cap_sock.c
index b0efb7202957..f65caf41953f 100644
--- a/net/bluetooth/l2cap_sock.c
+++ b/net/bluetooth/l2cap_sock.c
@@ -1336,13 +1336,6 @@ static struct sk_buff *l2cap_sock_alloc_skb_cb(struct l2cap_chan *chan,
         return skb;
 }
 
-static int l2cap_sock_memcpy_fromiovec_cb(struct l2cap_chan *chan,
-                                          unsigned char *kdata,
-                                          struct iovec *iov, int len)
-{
-        return memcpy_fromiovec(kdata, iov, len);
-}
-
 static void l2cap_sock_ready_cb(struct l2cap_chan *chan)
 {
         struct sock *sk = chan->data;
@@ -1427,7 +1420,6 @@ static const struct l2cap_ops l2cap_chan_ops = {
         .set_shutdown           = l2cap_sock_set_shutdown_cb,
         .get_sndtimeo           = l2cap_sock_get_sndtimeo_cb,
         .alloc_skb              = l2cap_sock_alloc_skb_cb,
-        .memcpy_fromiovec       = l2cap_sock_memcpy_fromiovec_cb,
 };
 
 static void l2cap_sock_destruct(struct sock *sk)
diff --git a/net/bluetooth/smp.c b/net/bluetooth/smp.c
index 96bf16dcd9e9..6a46252fe66f 100644
--- a/net/bluetooth/smp.c
+++ b/net/bluetooth/smp.c
@@ -539,8 +539,7 @@ static void smp_send_cmd(struct l2cap_conn *conn, u8 code, u16 len, void *data)
 
         memset(&msg, 0, sizeof(msg));
 
-        msg.msg_iov = (struct iovec *) &iv;
-        msg.msg_iovlen = 2;
+        iov_iter_kvec(&msg.msg_iter, WRITE | ITER_KVEC, iv, 2, 1 + len);
 
         l2cap_chan_send(chan, &msg, 1 + len);
 
@@ -2865,7 +2864,6 @@ static const struct l2cap_ops smp_chan_ops = {
         .suspend                = l2cap_chan_no_suspend,
         .set_shutdown           = l2cap_chan_no_set_shutdown,
         .get_sndtimeo           = l2cap_chan_no_get_sndtimeo,
-        .memcpy_fromiovec       = l2cap_chan_no_memcpy_fromiovec,
 };
 
 static inline struct l2cap_chan *smp_new_conn_cb(struct l2cap_chan *pchan)
@@ -2914,7 +2912,6 @@ static const struct l2cap_ops smp_root_chan_ops = {
         .resume                 = l2cap_chan_no_resume,
         .set_shutdown           = l2cap_chan_no_set_shutdown,
         .get_sndtimeo           = l2cap_chan_no_get_sndtimeo,
-        .memcpy_fromiovec       = l2cap_chan_no_memcpy_fromiovec,
 };
 
 static struct l2cap_chan *smp_add_cid(struct hci_dev *hdev, u16 cid)