tty: switch size and count types in iterate_tty_read() to size_t
authorJiri Slaby (SUSE) <jirislaby@kernel.org>
Thu, 10 Aug 2023 09:14:59 +0000 (11:14 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 11 Aug 2023 19:12:46 +0000 (21:12 +0200)
ld->ops->read() returns ssize_t. copy_to_iter() returns size_t. So
switch the variables ('size' and 'copied', respectively) to the
corresponding types.

This allows for use of min() in the next patch.

Signed-off-by: "Jiri Slaby (SUSE)" <jirislaby@kernel.org>
Link: https://lore.kernel.org/r/20230810091510.13006-26-jirislaby@kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/tty/tty_io.c

index e824877..7cfa99f 100644 (file)
@@ -850,10 +850,10 @@ static ssize_t iterate_tty_read(struct tty_ldisc *ld, struct tty_struct *tty,
        unsigned long offset = 0;
        char kernel_buf[64];
        ssize_t retval = 0;
-       size_t count = iov_iter_count(to);
+       size_t copied, count = iov_iter_count(to);
 
        do {
-               int size, copied;
+               ssize_t size;
 
                size = count > sizeof(kernel_buf) ? sizeof(kernel_buf) : count;
                size = ld->ops->read(tty, file, kernel_buf, size, &cookie, offset);