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

tty: use ssize_t for iterate_tty_read() returned type 



tty_read() is supposed to return ssize_t. It takes the return value from
iterate_tty_read(). That currently returns int. On the top of that,
iterate_tty_write() already returns ssize_t. So switch
iterate_tty_read() to ssize_t too, so that all three are consistent.

This means 'i' in tty_read() changes its type too. And while changing
that, rename this generic 'i' to more dedicated 'ret'.

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


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

drivers/tty/tty_io.c

+8 −8
Original line number Diff line number Diff line
@@ -843,13 +843,13 @@ static void tty_update_time(struct tty_struct *tty, bool mtime) 
 * data or clears the cookie. The cookie may be something that the

 * ldisc maintains state for and needs to free.

 */

static int iterate_tty_read(struct tty_ldisc *ld, struct tty_struct *tty,

static ssize_t iterate_tty_read(struct tty_ldisc *ld, struct tty_struct *tty,

				struct file *file, struct iov_iter *to)

{

	int retval = 0;

	void *cookie = NULL;

	unsigned long offset = 0;

	char kernel_buf[64];

	ssize_t retval = 0;

	size_t count = iov_iter_count(to);



	do {
@@ -912,11 +912,11 @@ static int iterate_tty_read(struct tty_ldisc *ld, struct tty_struct *tty, 
 */

static ssize_t tty_read(struct kiocb *iocb, struct iov_iter *to)

{

	int i;

	struct file *file = iocb->ki_filp;

	struct inode *inode = file_inode(file);

	struct tty_struct *tty = file_tty(file);

	struct tty_ldisc *ld;

	ssize_t ret;



	if (tty_paranoia_check(tty, inode, "tty_read"))

		return -EIO;
@@ -929,15 +929,15 @@ static ssize_t tty_read(struct kiocb *iocb, struct iov_iter *to) 
	ld = tty_ldisc_ref_wait(tty);

	if (!ld)

		return hung_up_tty_read(iocb, to);

	i = -EIO;

	ret = -EIO;

	if (ld->ops->read)

		i = iterate_tty_read(ld, tty, file, to);

		ret = iterate_tty_read(ld, tty, file, to);

	tty_ldisc_deref(ld);



	if (i > 0)

	if (ret > 0)

		tty_update_time(tty, false);



	return i;

	return ret;

}



void tty_write_unlock(struct tty_struct *tty)