mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-11-14 07:44:21 +08:00
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>
This commit is contained in:
parent
24b01c5d49
commit
e3afc5b0d7
@ -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);
|
||||
|
Loading…
Reference in New Issue
Block a user