Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eef15e2a authored by Peter Hurley's avatar Peter Hurley Committed by Greg Kroah-Hartman
Browse files

tty: Remove warning in tty_lock_slave() 



Commit 2aff5e2b ('tty: Change
tty lock order to master->slave') added a warning which is broken
and unnecessary now that the tty lock has fixed lock subclasses,
added in commit 2febdb63
('tty: Preset lock subclass for nested tty locks').

Reported-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarPeter Hurley <peter@hurleysoftware.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 2e408136

drivers/tty/tty_mutex.c

+1 −5
Original line number Diff line number Diff line
@@ -46,13 +46,9 @@ EXPORT_SYMBOL(tty_unlock); 


void __lockfunc tty_lock_slave(struct tty_struct *tty)

{

	if (tty && tty != tty->link) {

		WARN_ON(!mutex_is_locked(&tty->link->legacy_mutex) ||

			!tty->driver->type == TTY_DRIVER_TYPE_PTY ||

			!tty->driver->type == PTY_TYPE_SLAVE);

	if (tty && tty != tty->link)

		tty_lock(tty);

}

}



void __lockfunc tty_unlock_slave(struct tty_struct *tty)

{