Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752986AbaJPUuP (ORCPT ); Thu, 16 Oct 2014 16:50:15 -0400 Received: from mailout32.mail01.mtsvc.net ([216.70.64.70]:36601 "EHLO n23.mail01.mtsvc.net" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752951AbaJPUuM (ORCPT ); Thu, 16 Oct 2014 16:50:12 -0400 From: Peter Hurley To: Greg Kroah-Hartman Cc: linux-kernel@vger.kernel.org, Jiri Slaby , linux-serial@vger.kernel.org, One Thousand Gnomes , Peter Hurley Subject: [PATCH -next 17/27] tty: Simplify tty_release() state checks Date: Thu, 16 Oct 2014 16:25:15 -0400 Message-Id: <1413491125-20134-18-git-send-email-peter@hurleysoftware.com> X-Mailer: git-send-email 2.1.1 In-Reply-To: <1413491125-20134-1-git-send-email-peter@hurleysoftware.com> References: <1413491125-20134-1-git-send-email-peter@hurleysoftware.com> X-Authenticated-User: 990527 peter@hurleysoftware.com X-MT-ID: 8FA290C2A27252AACF65DBC4A42F3CE3735FB2A4 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The local o_tty variable in tty_release() is now accessed only when closing the pty master. Set o_tty to slave pty when closing pty master, otherwise NULL; use o_tty != NULL as replacement for pty_master. Signed-off-by: Peter Hurley --- drivers/tty/tty_io.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c index 8fedd22..fb043b9 100644 --- a/drivers/tty/tty_io.c +++ b/drivers/tty/tty_io.c @@ -1758,8 +1758,8 @@ static int tty_release_checks(struct tty_struct *tty, int idx) int tty_release(struct inode *inode, struct file *filp) { struct tty_struct *tty = file_tty(filp); - struct tty_struct *o_tty; - int pty_master, do_sleep, final; + struct tty_struct *o_tty = NULL; + int do_sleep, final; int idx; char buf[64]; long timeout = 0; @@ -1774,10 +1774,9 @@ int tty_release(struct inode *inode, struct file *filp) __tty_fasync(-1, filp, 0); idx = tty->index; - pty_master = (tty->driver->type == TTY_DRIVER_TYPE_PTY && - tty->driver->subtype == PTY_TYPE_MASTER); - /* Review: parallel close */ - o_tty = tty->link; + if (tty->driver->type == TTY_DRIVER_TYPE_PTY && + tty->driver->subtype == PTY_TYPE_MASTER) + o_tty = tty->link; if (tty_release_checks(tty, idx)) { tty_unlock(tty); @@ -1821,7 +1820,7 @@ int tty_release(struct inode *inode, struct file *filp) do_sleep++; } } - if (pty_master && o_tty->count <= 1) { + if (o_tty && o_tty->count <= 1) { if (waitqueue_active(&o_tty->read_wait)) { wake_up_poll(&o_tty->read_wait, POLLIN); do_sleep++; @@ -1846,7 +1845,7 @@ int tty_release(struct inode *inode, struct file *filp) timeout = MAX_SCHEDULE_TIMEOUT; } - if (pty_master) { + if (o_tty) { if (--o_tty->count < 0) { printk(KERN_WARNING "%s: bad pty slave count (%d) for %s\n", __func__, o_tty->count, tty_name(o_tty, buf)); @@ -1880,13 +1879,13 @@ int tty_release(struct inode *inode, struct file *filp) if (!tty->count) { read_lock(&tasklist_lock); session_clear_tty(tty->session); - if (pty_master) + if (o_tty) session_clear_tty(o_tty->session); read_unlock(&tasklist_lock); } /* check whether both sides are closing ... */ - final = !tty->count && !(pty_master && o_tty->count); + final = !tty->count && !(o_tty && o_tty->count); tty_unlock_pair(tty, o_tty); /* At this point, the tty->count == 0 should ensure a dead tty -- 2.1.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/