Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752813AbaBXO6M (ORCPT ); Mon, 24 Feb 2014 09:58:12 -0500 Received: from mail-ie0-f170.google.com ([209.85.223.170]:59434 "EHLO mail-ie0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752313AbaBXO6K (ORCPT ); Mon, 24 Feb 2014 09:58:10 -0500 MIME-Version: 1.0 In-Reply-To: <1393253450-12217-1-git-send-email-hare@suse.de> References: <1393253450-12217-1-git-send-email-hare@suse.de> Date: Mon, 24 Feb 2014 15:58:09 +0100 Message-ID: Subject: Re: [PATCHv3] tty: Set correct tty name in 'active' sysfs attribute From: David Herrmann To: Hannes Reinecke Cc: linux-kernel , Ray Strode , Lennart Poettering , Kay Sievers , Greg Kroah-Hartman , Jiri Slaby , Werner Fink Content-Type: text/plain; charset=ISO-8859-1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi On Mon, Feb 24, 2014 at 3:50 PM, Hannes Reinecke wrote: > The 'active' sysfs attribute should refer to the currently > active tty devices the console is running on, not the currently > active console. > The console structure doesn't refer to any device in sysfs, > only the tty the console is running on has. > So we need to print out the tty names in 'active', not > the console names. > But we need to take care for the virtual console to always display > 'tty0' so as not to break existing programs. > > Cc: Lennart Poettering > Cc: Kay Sievers > Cc: Greg Kroah-Hartman > Cc: Jiri Slaby > Signed-off-by: Werner Fink > Signed-off-by: Hannes Reinecke > --- > drivers/tty/tty_io.c | 24 ++++++++++++++++++------ > 1 file changed, 18 insertions(+), 6 deletions(-) > > diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c > index c74a00a..96eb462 100644 > --- a/drivers/tty/tty_io.c > +++ b/drivers/tty/tty_io.c > @@ -1271,12 +1271,13 @@ static void pty_line_name(struct tty_driver *driver, int index, char *p) > * > * Locking: None > */ > -static void tty_line_name(struct tty_driver *driver, int index, char *p) > +static ssize_t tty_line_name(struct tty_driver *driver, int index, char *p) > { > if (driver->flags & TTY_DRIVER_UNNUMBERED_NODE) > - strcpy(p, driver->name); > + return sprintf(p, "%s", driver->name); > else > - sprintf(p, "%s%d", driver->name, index + driver->name_base); > + return sprintf(p, "%s%d", driver->name, > + index + driver->name_base); > } > > /** > @@ -3545,9 +3546,20 @@ static ssize_t show_cons_active(struct device *dev, > if (i >= ARRAY_SIZE(cs)) > break; > } > - while (i--) > - count += sprintf(buf + count, "%s%d%c", > - cs[i]->name, cs[i]->index, i ? ' ':'\n'); > + while (i--) { > + struct tty_driver *driver; > + const char *name = cs[i]->name; > + int index = cs[i]->index; > + > + driver = cs[i]->device(cs[i], &index); > + /* Some programs rely on 'tty0' for console */ > + if (driver && (index > 0 || driver->major != TTY_MAJOR)) { As Ray mentioned in the previous discussion, this has to be cs[i]->index instead of "index" as ->device() changes the parameter. See drivers/tty/vt/vt.c vt_console_device(). Thanks David > + count += tty_line_name(driver, index, buf + count); > + count += sprintf(buf + count, "%c", i ? ' ':'\n'); > + } else > + count += sprintf(buf + count, "%s%d%c", > + name, cs[i]->index, i ? ' ':'\n'); > + } > console_unlock(); > > return count; > -- > 1.7.12.4 > -- 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/