iov_iter: remove unused 'iov' argument from import_single_range()

It is entirely unused, just get rid of it.

Signed-off-by: Jens Axboe <axboe@kernel.dk>
Link: https://lore.kernel.org/r/20231204174827.1258875-2-axboe@kernel.dk
Signed-off-by: Christian Brauner <brauner@kernel.org>

diff --git a/drivers/block/ublk_drv.c b/drivers/block/ublk_drv.c
index 83600b45e12a28d8764a3d701355f0ed9208b8ea..5656b0a1233d68b717df89b18df23c0bd42e7bdf 100644 (file)
--- a/drivers/block/ublk_drv.c
+++ b/drivers/block/ublk_drv.c
@@ -893,11 +893,10 @@ static int ublk_map_io(const struct ublk_queue *ubq, const struct request *req,
         */
        if (ublk_need_map_req(req)) {
                struct iov_iter iter;
-               struct iovec iov;
                const int dir = ITER_DEST;
 
                import_single_range(dir, u64_to_user_ptr(io->addr), rq_bytes,
-                               &iov, &iter);
+                                       &iter);
 
                return ublk_copy_user_pages(req, 0, &iter, dir);
        }
@@ -915,13 +914,12 @@ static int ublk_unmap_io(const struct ublk_queue *ubq,
 
        if (ublk_need_unmap_req(req)) {
                struct iov_iter iter;
-               struct iovec iov;
                const int dir = ITER_SOURCE;
 
                WARN_ON_ONCE(io->res > rq_bytes);
 
                import_single_range(dir, u64_to_user_ptr(io->addr), io->res,
-                               &iov, &iter);
+                                       &iter);
                return ublk_copy_user_pages(req, 0, &iter, dir);
        }
        return rq_bytes;

diff --git a/drivers/char/random.c b/drivers/char/random.c
index 4a9c79391dee93ae19048aa25729fe500deb6ddf..e79ae238b30d7a0b5ffe5bb5264a43eb61df4627 100644 (file)
--- a/drivers/char/random.c
+++ b/drivers/char/random.c
@@ -1364,7 +1364,6 @@ static void __cold try_to_generate_entropy(void)
 SYSCALL_DEFINE3(getrandom, char __user *, ubuf, size_t, len, unsigned int, flags)
 {
        struct iov_iter iter;
-       struct iovec iov;
        int ret;
 
        if (flags & ~(GRND_NONBLOCK | GRND_RANDOM | GRND_INSECURE))
@@ -1385,7 +1384,7 @@ SYSCALL_DEFINE3(getrandom, char __user *, ubuf, size_t, len, unsigned int, flags
                        return ret;
        }
 
-       ret = import_single_range(ITER_DEST, ubuf, len, &iov, &iter);
+       ret = import_single_range(ITER_DEST, ubuf, len, &iter);
        if (unlikely(ret))
                return ret;
        return get_random_bytes_user(&iter);
@@ -1491,7 +1490,6 @@ static long random_ioctl(struct file *f, unsigned int cmd, unsigned long arg)
                return 0;
        case RNDADDENTROPY: {
                struct iov_iter iter;
-               struct iovec iov;
                ssize_t ret;
                int len;
 
@@ -1503,7 +1501,7 @@ static long random_ioctl(struct file *f, unsigned int cmd, unsigned long arg)
                        return -EINVAL;
                if (get_user(len, p++))
                        return -EFAULT;
-               ret = import_single_range(ITER_SOURCE, p, len, &iov, &iter);
+               ret = import_single_range(ITER_SOURCE, p, len, &iter);
                if (unlikely(ret))
                        return ret;
                ret = write_pool_user(&iter);

diff --git a/fs/aio.c b/fs/aio.c
index f8589caef9c10ec829bc6470cab5ce159915114c..251eeaef7fbf56791fa9a61b0e580fc2da6f0bb4 100644 (file)
--- a/fs/aio.c
+++ b/fs/aio.c
@@ -1498,7 +1498,7 @@ static ssize_t aio_setup_rw(int rw, const struct iocb *iocb,
        size_t len = iocb->aio_nbytes;
 
        if (!vectored) {
-               ssize_t ret = import_single_range(rw, buf, len, *iovec, iter);
+               ssize_t ret = import_single_range(rw, buf, len, iter);
                *iovec = NULL;
                return ret;
        }

diff --git a/include/linux/uio.h b/include/linux/uio.h
index b6214cbf2a43f8e3820b0642ce1de2e082a4d86e..bfafd3542fa768ac79a5fac34dd7414435283538 100644 (file)
--- a/include/linux/uio.h
+++ b/include/linux/uio.h
@@ -348,7 +348,7 @@ ssize_t __import_iovec(int type, const struct iovec __user *uvec,
                 unsigned nr_segs, unsigned fast_segs, struct iovec **iovp,
                 struct iov_iter *i, bool compat);
 int import_single_range(int type, void __user *buf, size_t len,
-                struct iovec *iov, struct iov_iter *i);
+                struct iov_iter *i);
 int import_ubuf(int type, void __user *buf, size_t len, struct iov_iter *i);
 
 static inline void iov_iter_ubuf(struct iov_iter *i, unsigned int direction,

diff --git a/kernel/trace/trace_events_user.c b/kernel/trace/trace_events_user.c
index 9365ce40742639c348de464baaa335d61bfe5200..4efc75d90a0ddd82800c170955626f51c2bbbb4f 100644 (file)
--- a/kernel/trace/trace_events_user.c
+++ b/kernel/trace/trace_events_user.c
@@ -2177,14 +2177,13 @@ static int user_events_open(struct inode *node, struct file *file)
 static ssize_t user_events_write(struct file *file, const char __user *ubuf,
                                 size_t count, loff_t *ppos)
 {
-       struct iovec iov;
        struct iov_iter i;
 
        if (unlikely(*ppos != 0))
                return -EFAULT;
 
        if (unlikely(import_single_range(ITER_SOURCE, (char __user *)ubuf,
-                                        count, &iov, &i)))
+                                        count, &i)))
                return -EFAULT;
 
        return user_events_write_core(file, &i);

diff --git a/lib/iov_iter.c b/lib/iov_iter.c
index de7d11cf4c6356deccc37f180fa992dbe4d4c7b0..d60c73354e1fa0b72d1a9f52b3d0b51d451f466d 100644 (file)
--- a/lib/iov_iter.c
+++ b/lib/iov_iter.c
@@ -1370,7 +1370,7 @@ ssize_t import_iovec(int type, const struct iovec __user *uvec,
 EXPORT_SYMBOL(import_iovec);
 
 int import_single_range(int rw, void __user *buf, size_t len,
-                struct iovec *iov, struct iov_iter *i)
+                       struct iov_iter *i)
 {
        if (len > MAX_RW_COUNT)
                len = MAX_RW_COUNT;

diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
index 53bcc17c91e4c4fc0799f3f5d51b7ad5c8f32b26..57cf3adb191a5540e9943b457445854b06f0c495 100644 (file)
--- a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
@@ -1849,7 +1849,6 @@ static int receive_fallback_to_copy(struct sock *sk,
 {
        unsigned long copy_address = (unsigned long)zc->copybuf_address;
        struct msghdr msg = {};
-       struct iovec iov;
        int err;
 
        zc->length = 0;
@@ -1859,7 +1858,7 @@ static int receive_fallback_to_copy(struct sock *sk,
                return -EINVAL;
 
        err = import_single_range(ITER_DEST, (void __user *)copy_address,
-                                 inq, &iov, &msg.msg_iter);
+                                 inq, &msg.msg_iter);
        if (err)
                return err;
 
@@ -1886,14 +1885,13 @@ static int tcp_copy_straggler_data(struct tcp_zerocopy_receive *zc,
 {
        unsigned long copy_address = (unsigned long)zc->copybuf_address;
        struct msghdr msg = {};
-       struct iovec iov;
        int err;
 
        if (copy_address != zc->copybuf_address)
                return -EINVAL;
 
        err = import_single_range(ITER_DEST, (void __user *)copy_address,
-                                 copylen, &iov, &msg.msg_iter);
+                                 copylen, &msg.msg_iter);
        if (err)
                return err;
        err = skb_copy_datagram_msg(skb, *offset, &msg, copylen);

diff --git a/net/socket.c b/net/socket.c
index 3379c64217a4c1e166f3fc0ef5053c152b2eb80e..1f0d0e8d0a504c83a34282072fb66a58ba5c34b3 100644 (file)
--- a/net/socket.c
+++ b/net/socket.c
@@ -2161,10 +2161,9 @@ int __sys_sendto(int fd, void __user *buff, size_t len, unsigned int flags,
        struct sockaddr_storage address;
        int err;
        struct msghdr msg;
-       struct iovec iov;
        int fput_needed;
 
-       err = import_single_range(ITER_SOURCE, buff, len, &iov, &msg.msg_iter);
+       err = import_single_range(ITER_SOURCE, buff, len, &msg.msg_iter);
        if (unlikely(err))
                return err;
        sock = sockfd_lookup_light(fd, &err, &fput_needed);
@@ -2226,11 +2225,10 @@ int __sys_recvfrom(int fd, void __user *ubuf, size_t size, unsigned int flags,
                .msg_name = addr ? (struct sockaddr *)&address : NULL,
        };
        struct socket *sock;
-       struct iovec iov;
        int err, err2;
        int fput_needed;
 
-       err = import_single_range(ITER_DEST, ubuf, size, &iov, &msg.msg_iter);
+       err = import_single_range(ITER_DEST, ubuf, size, &msg.msg_iter);
        if (unlikely(err))
                return err;
        sock = sockfd_lookup_light(fd, &err, &fput_needed);

diff --git a/security/keys/keyctl.c b/security/keys/keyctl.c
index 19be69fa4d052a6a47e331e9100cc5eeecb4f384..193df7ca3ca84e9bd41b390907a676fa1d114ad3 100644 (file)
--- a/security/keys/keyctl.c
+++ b/security/keys/keyctl.c
@@ -1252,12 +1252,11 @@ long keyctl_instantiate_key(key_serial_t id,
                            key_serial_t ringid)
 {
        if (_payload && plen) {
-               struct iovec iov;
                struct iov_iter from;
                int ret;
 
                ret = import_single_range(ITER_SOURCE, (void __user *)_payload, plen,
-                                         &iov, &from);
+                                         &from);
                if (unlikely(ret))
                        return ret;