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>

2 files changed, 4 insertions, 4 deletions

diff --git a/crypto/algif_hash.c b/crypto/algif_hash.c
index 35c93ff11f35..83cd2cc49c9f 100644
--- a/crypto/algif_hash.c
+++ b/crypto/algif_hash.c
@@ -42,7 +42,7 @@ static int hash_sendmsg(struct kiocb *unused, struct socket *sock,
         struct alg_sock *ask = alg_sk(sk);
         struct hash_ctx *ctx = ask->private;
         unsigned long iovlen;
-        struct iovec *iov;
+        const struct iovec *iov;
         long copied = 0;
         int err;
 
@@ -58,7 +58,7 @@ static int hash_sendmsg(struct kiocb *unused, struct socket *sock,
 
         ctx->more = 0;
 
-        for (iov = msg->msg_iov, iovlen = msg->msg_iovlen; iovlen > 0;
+        for (iov = msg->msg_iter.iov, iovlen = msg->msg_iter.nr_segs; iovlen > 0;
              iovlen--, iov++) {
                 unsigned long seglen = iov->iov_len;
                 char __user *from = iov->iov_base;
diff --git a/crypto/algif_skcipher.c b/crypto/algif_skcipher.c
index c3b482bee208..4f45dab24648 100644
--- a/crypto/algif_skcipher.c
+++ b/crypto/algif_skcipher.c
@@ -429,13 +429,13 @@ static int skcipher_recvmsg(struct kiocb *unused, struct socket *sock,
         struct skcipher_sg_list *sgl;
         struct scatterlist *sg;
         unsigned long iovlen;
-        struct iovec *iov;
+        const struct iovec *iov;
         int err = -EAGAIN;
         int used;
         long copied = 0;
 
         lock_sock(sk);
-        for (iov = msg->msg_iov, iovlen = msg->msg_iovlen; iovlen > 0;
+        for (iov = msg->msg_iter.iov, iovlen = msg->msg_iter.nr_segs; iovlen > 0;
              iovlen--, iov++) {
                 unsigned long seglen = iov->iov_len;
                 char __user *from = iov->iov_base;