lkml.org 
[lkml]   [2014]   [Nov]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH -next v2 16/26] tty: Simplify tty_release_checks() interface
    Date
    Passing the 'other' tty to tty_release_checks() only makes sense
    for a pty pair; make o_tty scope local instead.

    Reviewed-by: Alan Cox <alan@linux.intel.com>
    Signed-off-by: Peter Hurley <peter@hurleysoftware.com>
    ---
    drivers/tty/tty_io.c | 7 ++++---
    1 file changed, 4 insertions(+), 3 deletions(-)

    diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c
    index 4034e5e..c765260 100644
    --- a/drivers/tty/tty_io.c
    +++ b/drivers/tty/tty_io.c
    @@ -1702,8 +1702,7 @@ static void release_tty(struct tty_struct *tty, int idx)
    * Performs some paranoid checking before true release of the @tty.
    * This is a no-op unless TTY_PARANOIA_CHECK is defined.
    */
    -static int tty_release_checks(struct tty_struct *tty, struct tty_struct *o_tty,
    - int idx)
    +static int tty_release_checks(struct tty_struct *tty, int idx)
    {
    #ifdef TTY_PARANOIA_CHECK
    if (idx < 0 || idx >= tty->driver->num) {
    @@ -1722,6 +1721,8 @@ static int tty_release_checks(struct tty_struct *tty, struct tty_struct *o_tty,
    return -1;
    }
    if (tty->driver->other) {
    + struct tty_struct *o_tty = tty->link;
    +
    if (o_tty != tty->driver->other->ttys[idx]) {
    printk(KERN_DEBUG "%s: other->table[%d] not o_tty for (%s)\n",
    __func__, idx, tty->name);
    @@ -1779,7 +1780,7 @@ int tty_release(struct inode *inode, struct file *filp)
    /* Review: parallel close */
    o_tty = tty->link;

    - if (tty_release_checks(tty, o_tty, idx)) {
    + if (tty_release_checks(tty, idx)) {
    tty_unlock(tty);
    return 0;
    }
    --
    2.1.3


    \
     
     \ /
      Last update: 2014-11-05 19:01    [W:3.746 / U:0.032 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site