put iov_iter into msghdr

Note that the code _using_ ->msg_iter at that point will be very
unhappy with anything other than unshifted iovec-backed iov_iter.
We still need to convert users to proper primitives.

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

1 files changed, 2 insertions, 6 deletions

diff --git a/drivers/net/tun.c b/drivers/net/tun.c
index 9c58286b8a42..f3e992ed87ac 100644
--- a/drivers/net/tun.c
+++ b/drivers/net/tun.c
@@ -1449,13 +1449,11 @@ static int tun_sendmsg(struct kiocb *iocb, struct socket *sock,
         int ret;
         struct tun_file *tfile = container_of(sock, struct tun_file, socket);
         struct tun_struct *tun = __tun_get(tfile);
-        struct iov_iter from;
 
         if (!tun)
                 return -EBADFD;
 
-        iov_iter_init(&from, WRITE, m->msg_iov, m->msg_iovlen, total_len);
-        ret = tun_get_user(tun, tfile, m->msg_control, &from,
+        ret = tun_get_user(tun, tfile, m->msg_control, &m->msg_iter,
                            m->msg_flags & MSG_DONTWAIT);
         tun_put(tun);
         return ret;
@@ -1467,7 +1465,6 @@ static int tun_recvmsg(struct kiocb *iocb, struct socket *sock,
 {
         struct tun_file *tfile = container_of(sock, struct tun_file, socket);
         struct tun_struct *tun = __tun_get(tfile);
-        struct iov_iter to;
         int ret;
 
         if (!tun)
@@ -1482,8 +1479,7 @@ static int tun_recvmsg(struct kiocb *iocb, struct socket *sock,
                                          SOL_PACKET, TUN_TX_TIMESTAMP);
                 goto out;
         }
-        iov_iter_init(&to, READ, m->msg_iov, m->msg_iovlen, total_len);
-        ret = tun_do_read(tun, tfile, &to, flags & MSG_DONTWAIT);
+        ret = tun_do_read(tun, tfile, &m->msg_iter, flags & MSG_DONTWAIT);
         if (ret > total_len) {
                 m->msg_flags |= MSG_TRUNC;
                 ret = flags & MSG_TRUNC ? ret : total_len;