From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752249AbbK1C04 (ORCPT ); Fri, 27 Nov 2015 21:26:56 -0500 Received: from mail-io0-f177.google.com ([209.85.223.177]:35983 "EHLO mail-io0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752033AbbK1C0j (ORCPT ); Fri, 27 Nov 2015 21:26:39 -0500 From: Peter Hurley To: Greg Kroah-Hartman Cc: Jiri Slaby , linux-kernel@vger.kernel.org, Peter Hurley Subject: [PATCH 08/12] pty: Prepare to redefine tty driver remove() interface Date: Fri, 27 Nov 2015 21:25:53 -0500 Message-Id: <1448677557-16420-9-git-send-email-peter@hurleysoftware.com> X-Mailer: git-send-email 2.6.3 In-Reply-To: <1448677557-16420-1-git-send-email-peter@hurleysoftware.com> References: <1448677557-16420-1-git-send-email-peter@hurleysoftware.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org BSD pty drivers are cross-linked at driver initialization and linked pairs must have the same tty index; use this information to simplify clearing the driver tables. Signed-off-by: Peter Hurley --- drivers/tty/pty.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/tty/pty.c b/drivers/tty/pty.c index be5020d..2680044 100644 --- a/drivers/tty/pty.c +++ b/drivers/tty/pty.c @@ -463,10 +463,8 @@ static int pty_install(struct tty_driver *driver, struct tty_struct *tty) static void pty_remove(struct tty_driver *driver, struct tty_struct *tty) { - struct tty_struct *pair = tty->link; driver->ttys[tty->index] = NULL; - if (pair) - pair->driver->ttys[pair->index] = NULL; + driver->other->ttys[tty->index] = NULL; } static int pty_bsd_ioctl(struct tty_struct *tty, -- 2.6.3