diff options
| author | Jiri Slaby (SUSE) <jirislaby@kernel.org> | 2023-08-10 11:14:59 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-08-11 21:12:46 +0200 |
| commit | e3afc5b0d708e2ef389b9c7acd45d1e4fd2cb304 (patch) | |
| tree | 2d6aa106478a38359b01660eaf7edd7fdc20bf7b /drivers/tty/tty_io.c | |
| parent | 24b01c5d497ba422f34d381a693d0592e95ad5c3 (diff) | |
tty: switch size and count types in iterate_tty_read() to size_t
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>
Diffstat (limited to 'drivers/tty/tty_io.c')
| -rw-r--r-- | drivers/tty/tty_io.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c index e8248773e3f0..7cfa99fbbb62 100644 --- a/drivers/tty/tty_io.c +++ b/drivers/tty/tty_io.c @@ -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); |