From: Dmitry Safonov <dima@arista.com>
To: linux-kernel@vger.kernel.org
Cc: "Dmitry Safonov" <0x7f454c46@gmail.com>,
"Dmitry Safonov" <dima@arista.com>,
"Daniel Axtens" <dja@axtens.net>,
"Dmitry Vyukov" <dvyukov@google.com>,
"Michael Neuling" <mikey@neuling.org>,
"Mikulas Patocka" <mpatocka@redhat.com>,
"Nathan March" <nathan@gt.net>, "Pasi Kärkkäinen" <pasik@iki.fi>,
"Peter Hurley" <peter@hurleysoftware.com>,
"Sergey Senozhatsky" <sergey.senozhatsky.work@gmail.com>,
"Tan Xiaojun" <tanxiaojun@huawei.com>,
"Tetsuo Handa" <penguin-kernel@I-love.SAKURA.ne.jp>,
"Jiri Slaby" <jslaby@suse.com>,
"Greg Kroah-Hartman" <gregkh@linuxfoundation.org>
Subject: [PATCHv2 4/4] tty: Simplify tty->count math in tty_reopen()
Date: Mon, 3 Sep 2018 17:52:57 +0100 [thread overview]
Message-ID: <20180903165257.29227-5-dima@arista.com> (raw)
In-Reply-To: <20180903165257.29227-1-dima@arista.com>
As noted by Jiri, tty_ldisc_reinit() shouldn't rely on tty counter.
Simplify math by increasing the counter after reinit success.
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Jiri Slaby <jslaby@suse.com>
Link: lkml.kernel.org/r/<20180829022353.23568-2-dima@arista.com>
Suggested-by: Jiri Slaby <jslaby@suse.com>
Signed-off-by: Dmitry Safonov <dima@arista.com>
---
drivers/tty/tty_io.c | 14 +++++---------
1 file changed, 5 insertions(+), 9 deletions(-)
diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c
index a947719b4626..7f968ac14bbd 100644
--- a/drivers/tty/tty_io.c
+++ b/drivers/tty/tty_io.c
@@ -1268,17 +1268,13 @@ static int tty_reopen(struct tty_struct *tty)
return -EBUSY;
tty_ldisc_lock(tty, MAX_SCHEDULE_TIMEOUT);
+ if (!tty->ldisc)
+ retval = tty_ldisc_reinit(tty, tty->termios.c_line);
+ tty_ldisc_unlock(tty);
- tty->count++;
- if (tty->ldisc)
- goto out_unlock;
+ if (retval == 0)
+ tty->count++;
- retval = tty_ldisc_reinit(tty, tty->termios.c_line);
- if (retval)
- tty->count--;
-
-out_unlock:
- tty_ldisc_unlock(tty);
return retval;
}
--
2.13.6
next prev parent reply other threads:[~2018-09-03 16:53 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-03 16:52 [PATCHv2 0/4] tty: Hold write ldisc sem in tty_reopen() Dmitry Safonov
2018-09-03 16:52 ` [PATCHv2 1/4] tty: Drop tty->count on tty_reopen() failure Dmitry Safonov
2018-09-04 8:58 ` Jiri Slaby
2018-09-03 16:52 ` [PATCHv2 2/4] tty: Hold tty_ldisc_lock() during tty_reopen() Dmitry Safonov
2018-09-04 1:51 ` Sergey Senozhatsky
2018-09-04 6:30 ` Jiri Slaby
2018-09-04 7:06 ` Sergey Senozhatsky
2018-09-04 9:02 ` Jiri Slaby
2018-09-03 16:52 ` [PATCHv2 3/4] tty/lockdep: Add ldisc_sem asserts Dmitry Safonov
2018-09-03 16:52 ` Dmitry Safonov [this message]
2018-09-04 9:03 ` [PATCHv2 4/4] tty: Simplify tty->count math in tty_reopen() Jiri Slaby
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180903165257.29227-5-dima@arista.com \
--to=dima@arista.com \
--cc=0x7f454c46@gmail.com \
--cc=dja@axtens.net \
--cc=dvyukov@google.com \
--cc=gregkh@linuxfoundation.org \
--cc=jslaby@suse.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mikey@neuling.org \
--cc=mpatocka@redhat.com \
--cc=nathan@gt.net \
--cc=pasik@iki.fi \
--cc=penguin-kernel@I-love.SAKURA.ne.jp \
--cc=peter@hurleysoftware.com \
--cc=sergey.senozhatsky.work@gmail.com \
--cc=tanxiaojun@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).