Commit ccc8dc00 authored by Jiri Slaby (SUSE)'s avatar Jiri Slaby (SUSE) Committed by Greg Kroah-Hartman
Browse files

tty: use min() in iterate_tty_write() 



It simplifies the code. The "price" is we have to unify 'chunk' to be
size_t the same as 'count' is. But that change is actually correct.

Signed-off-by: default avatar"Jiri Slaby (SUSE)" <jirislaby@kernel.org>
Link: https://lore.kernel.org/r/20230810091510.13006-24-jirislaby@kernel.org


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a32a672d

drivers/tty/tty_io.c

+2 −6
Original line number Diff line number Diff line
@@ -964,9 +964,8 @@ int tty_write_lock(struct tty_struct *tty, bool ndelay) 
static ssize_t iterate_tty_write(struct tty_ldisc *ld, struct tty_struct *tty,

				 struct file *file, struct iov_iter *from)

{

	size_t count = iov_iter_count(from);

	size_t chunk, count = iov_iter_count(from);

	ssize_t ret, written = 0;

	unsigned int chunk;



	ret = tty_write_lock(tty, file->f_flags & O_NDELAY);

	if (ret < 0)
@@ -1010,10 +1009,7 @@ static ssize_t iterate_tty_write(struct tty_ldisc *ld, struct tty_struct *tty, 


	/* Do the write .. */

	for (;;) {

		size_t size = count;



		if (size > chunk)

			size = chunk;

		size_t size = min(chunk, count);



		ret = -EFAULT;

		if (copy_from_iter(tty->write_buf, size, from) != size)