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

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

tty: Fold pty pair handling into tty_flush_works() 



Perform work flush for both ends of a pty pair within tty_flush_works(),
rather than calling twice.

Reviewed-by: default avatarAlan Cox <alan@linux.intel.com>
Signed-off-by: default avatarPeter Hurley <peter@hurleysoftware.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 324c1650

drivers/tty/tty_io.c

+7 −5
Original line number Diff line number Diff line
@@ -1584,15 +1584,19 @@ void tty_free_termios(struct tty_struct *tty) 
EXPORT_SYMBOL(tty_free_termios);



/**

 *	tty_flush_works		-	flush all works of a tty

 *	@tty: tty device to flush works for

 *	tty_flush_works		-	flush all works of a tty/pty pair

 *	@tty: tty device to flush works for (or either end of a pty pair)

 *

 *	Sync flush all works belonging to @tty.

 *	Sync flush all works belonging to @tty (and the 'other' tty).

 */

static void tty_flush_works(struct tty_struct *tty)

{

	flush_work(&tty->SAK_work);

	flush_work(&tty->hangup_work);

	if (tty->link) {

		flush_work(&tty->link->SAK_work);

		flush_work(&tty->link->hangup_work);

	}

}



/**
@@ -1892,8 +1896,6 @@ int tty_release(struct inode *inode, struct file *filp) 


	/* Wait for pending work before tty destruction commmences */

	tty_flush_works(tty);

	if (o_tty)

		tty_flush_works(o_tty);



#ifdef TTY_DEBUG_HANGUP

	printk(KERN_DEBUG "%s: %s: freeing structure...\n", __func__, tty_name(tty, buf));