github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-02 19:43:40 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

tty: n_tty: clean up process_output_block()

Browse Source 
* Use guard(mutex), which results in:
  - the function can return directly when "space == 0".
  - "i" can now be "unsigned" as it is no longer abused to hold a retval
    from tty->ops->write(). Note the compared-to "nr" is already
    "unsigned".
* The end label is now dubbed "do_write" as that is what happens there.
  Unlike the uncertain "break_out" name.

Signed-off-by: Jiri Slaby (SUSE) <jirislaby@kernel.org>
Link: https://lore.kernel.org/r/20250317070046.24386-8-jirislaby@kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Jiri Slaby (SUSE) 2025-03-17 08:00:22 +01:00 committed by Greg Kroah-Hartman
parent fdfa49a8c9
commit e287d64605
1 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
drivers/tty/n_tty.c
View File

@ -519,17 +519,15 @@ static ssize_t process_output_block(struct tty_struct *tty,
const u8 *buf, unsigned int nr)
{
struct n_tty_data *ldata = tty->disc_data;
unsigned int space;
int i;
unsigned int space, i;
const u8 *cp;
mutex_lock(&ldata->output_lock);
guard(mutex)(&ldata->output_lock);
space = tty_write_room(tty);
if (space == 0) {
mutex_unlock(&ldata->output_lock);
if (space == 0)
return 0;
}
if (nr > space)
nr = space;
@ -541,18 +539,18 @@ static ssize_t process_output_block(struct tty_struct *tty,
if (O_ONLRET(tty))
ldata->column = 0;
if (O_ONLCR(tty))
goto break_out;
goto do_write;
ldata->canon_column = ldata->column;
break;
case '\r':
if (O_ONOCR(tty) && ldata->column == 0)
goto break_out;
goto do_write;
if (O_OCRNL(tty))
goto break_out;
goto do_write;
ldata->canon_column = ldata->column = 0;
break;
case '\t':
goto break_out;
goto do_write;
case '\b':
if (ldata->column > 0)
ldata->column--;
@ -560,18 +558,15 @@ static ssize_t process_output_block(struct tty_struct *tty,
default:
if (!iscntrl(c)) {
if (O_OLCUC(tty))
goto break_out;
goto do_write;
if (!is_continuation(c, tty))
ldata->column++;
}
break;
}
}
break_out:
i = tty->ops->write(tty, buf, i);
mutex_unlock(&ldata->output_lock);
return i;
do_write:
return tty->ops->write(tty, buf, i);
}
static int n_tty_process_echo_ops(struct tty_struct *tty, size_t *tail,