iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tty: Abstract tty buffer work

Browse Source 
Introduce API functions to restart and cancel tty buffer work, rather
than manipulate buffer work directly.

Signed-off-by: Peter Hurley <peter@hurleysoftware.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Peter Hurley 2015-10-17 16:36:23 -04:00 committed by Greg Kroah-Hartman
parent 4b41b9539a
commit e176058f0d
5 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/tty/n_tty.c
View File

@ -201,7 +201,7 @@ static void n_tty_kick_worker(struct tty_struct *tty)
*/ */
WARN_RATELIMIT(test_bit(TTY_LDISC_HALTED, &tty->flags), WARN_RATELIMIT(test_bit(TTY_LDISC_HALTED, &tty->flags),
"scheduling buffer work for halted ldisc\n"); "scheduling buffer work for halted ldisc\n");
queue_work(system_unbound_wq, &tty->port->buf.work); tty_buffer_restart_work(tty->port);
} }
} }

10
drivers/tty/tty_buffer.c
View File

@ -587,3 +587,13 @@ void tty_buffer_set_lock_subclass(struct tty_port *port)
{ {
lockdep_set_subclass(&port->buf.lock, TTY_LOCK_SLAVE); lockdep_set_subclass(&port->buf.lock, TTY_LOCK_SLAVE);
} }
bool tty_buffer_restart_work(struct tty_port *port)
{
return queue_work(system_unbound_wq, &port->buf.work);
}
bool tty_buffer_cancel_work(struct tty_port *port)
{
return cancel_work_sync(&port->buf.work);
}

2
drivers/tty/tty_io.c
View File

@ -1689,7 +1689,7 @@ static void release_tty(struct tty_struct *tty, int idx)
tty->port->itty = NULL; tty->port->itty = NULL;
if (tty->link) if (tty->link)
tty->link->port->itty = NULL; tty->link->port->itty = NULL;
cancel_work_sync(&tty->port->buf.work); tty_buffer_cancel_work(tty->port);
tty_kref_put(tty->link); tty_kref_put(tty->link);
tty_kref_put(tty); tty_kref_put(tty);

2
drivers/tty/tty_port.c
View File

@ -130,7 +130,7 @@ EXPORT_SYMBOL(tty_port_free_xmit_buf);
*/ */
void tty_port_destroy(struct tty_port *port) void tty_port_destroy(struct tty_port *port)
{ {
cancel_work_sync(&port->buf.work); tty_buffer_cancel_work(port);
tty_buffer_free_all(port); tty_buffer_free_all(port);
} }
EXPORT_SYMBOL(tty_port_destroy); EXPORT_SYMBOL(tty_port_destroy);

2
include/linux/tty.h
View File

@ -467,6 +467,8 @@ extern void tty_buffer_free_all(struct tty_port *port);
extern void tty_buffer_flush(struct tty_struct *tty, struct tty_ldisc *ld); extern void tty_buffer_flush(struct tty_struct *tty, struct tty_ldisc *ld);
extern void tty_buffer_init(struct tty_port *port); extern void tty_buffer_init(struct tty_port *port);
extern void tty_buffer_set_lock_subclass(struct tty_port *port); extern void tty_buffer_set_lock_subclass(struct tty_port *port);
extern bool tty_buffer_restart_work(struct tty_port *port);
extern bool tty_buffer_cancel_work(struct tty_port *port);
extern speed_t tty_termios_baud_rate(struct ktermios *termios); extern speed_t tty_termios_baud_rate(struct ktermios *termios);
extern speed_t tty_termios_input_baud_rate(struct ktermios *termios); extern speed_t tty_termios_input_baud_rate(struct ktermios *termios);
extern void tty_termios_encode_baud_rate(struct ktermios *termios, extern void tty_termios_encode_baud_rate(struct ktermios *termios,