lkml.org 
[lkml]   [2008]   [Oct]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 30/80] tty: move tioclinux from a special case
    Date
    From: Alan Cox <alan@redhat.com>

    Right now we have ifdefs and hooks in the core ioctl handler for TIOCLINUX
    and then test if its a console. This is brain dead. Instead call the
    tioclinux helper from the relevant driver ioctl methods.

    Signed-off-by: Alan Cox <alan@redhat.com>
    ---

    drivers/char/tty_io.c | 4 ----
    drivers/char/vt.c | 2 --
    drivers/char/vt_ioctl.c | 2 ++
    3 files changed, 2 insertions(+), 6 deletions(-)


    diff --git a/drivers/char/tty_io.c b/drivers/char/tty_io.c
    index e4dce87..2f05728 100644
    --- a/drivers/char/tty_io.c
    +++ b/drivers/char/tty_io.c
    @@ -3026,10 +3026,6 @@ long tty_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
    return put_user(tty->ldisc.ops->num, (int __user *)p);
    case TIOCSETD:
    return tiocsetd(tty, p);
    -#ifdef CONFIG_VT
    - case TIOCLINUX:
    - return tioclinux(tty, arg);
    -#endif
    /*
    * Break handling
    */
    diff --git a/drivers/char/vt.c b/drivers/char/vt.c
    index 60359c3..05ca1c5 100644
    --- a/drivers/char/vt.c
    +++ b/drivers/char/vt.c
    @@ -2583,8 +2583,6 @@ int tioclinux(struct tty_struct *tty, unsigned long arg)
    int lines;
    int ret;

    - if (tty->driver->type != TTY_DRIVER_TYPE_CONSOLE)
    - return -EINVAL;
    if (current->signal->tty != tty && !capable(CAP_SYS_ADMIN))
    return -EPERM;
    if (get_user(type, p))
    diff --git a/drivers/char/vt_ioctl.c b/drivers/char/vt_ioctl.c
    index c904e9a..8944ce5 100644
    --- a/drivers/char/vt_ioctl.c
    +++ b/drivers/char/vt_ioctl.c
    @@ -395,6 +395,8 @@ int vt_ioctl(struct tty_struct *tty, struct file * file,

    kbd = kbd_table + console;
    switch (cmd) {
    + case TIOCLINUX:
    + return tioclinux(tty, arg);
    case KIOCSOUND:
    if (!perm)
    goto eperm;


    \
     
     \ /
      Last update: 2008-10-13 11:47    [W:0.021 / U:34.876 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site