From: Peter Hurley <peter@hurleysoftware.com>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: linux-kernel@vger.kernel.org, Jiri Slaby <jslaby@suse.cz>,
linux-serial@vger.kernel.org,
One Thousand Gnomes <gnomes@lxorguk.ukuu.org.uk>,
Peter Hurley <peter@hurleysoftware.com>
Subject: [PATCH -next 24/27] tty: Prefix tty_ldisc_{lock,lock_nested,unlock} functions
Date: Thu, 16 Oct 2014 16:25:22 -0400 [thread overview]
Message-ID: <1413491125-20134-25-git-send-email-peter@hurleysoftware.com> (raw)
In-Reply-To: <1413491125-20134-1-git-send-email-peter@hurleysoftware.com>
tty_ldisc_lock(), tty_ldisc_unlock(), and tty_ldisc_lock_nested()
are low-level aliases for the underlying lock mechanism. Rename
with double underscore to allow for new, higher level functions
with those names.
Signed-off-by: Peter Hurley <peter@hurleysoftware.com>
---
drivers/tty/tty_ldisc.c | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/drivers/tty/tty_ldisc.c b/drivers/tty/tty_ldisc.c
index 1c4d7b6..5bdc241 100644
--- a/drivers/tty/tty_ldisc.c
+++ b/drivers/tty/tty_ldisc.c
@@ -308,19 +308,19 @@ EXPORT_SYMBOL_GPL(tty_ldisc_deref);
static inline int __lockfunc
-tty_ldisc_lock(struct tty_struct *tty, unsigned long timeout)
+__tty_ldisc_lock(struct tty_struct *tty, unsigned long timeout)
{
return ldsem_down_write(&tty->ldisc_sem, timeout);
}
static inline int __lockfunc
-tty_ldisc_lock_nested(struct tty_struct *tty, unsigned long timeout)
+__tty_ldisc_lock_nested(struct tty_struct *tty, unsigned long timeout)
{
return ldsem_down_write_nested(&tty->ldisc_sem,
LDISC_SEM_OTHER, timeout);
}
-static inline void tty_ldisc_unlock(struct tty_struct *tty)
+static inline void __tty_ldisc_unlock(struct tty_struct *tty)
{
return ldsem_up_write(&tty->ldisc_sem);
}
@@ -332,24 +332,24 @@ tty_ldisc_lock_pair_timeout(struct tty_struct *tty, struct tty_struct *tty2,
int ret;
if (tty < tty2) {
- ret = tty_ldisc_lock(tty, timeout);
+ ret = __tty_ldisc_lock(tty, timeout);
if (ret) {
- ret = tty_ldisc_lock_nested(tty2, timeout);
+ ret = __tty_ldisc_lock_nested(tty2, timeout);
if (!ret)
- tty_ldisc_unlock(tty);
+ __tty_ldisc_unlock(tty);
}
} else {
/* if this is possible, it has lots of implications */
WARN_ON_ONCE(tty == tty2);
if (tty2 && tty != tty2) {
- ret = tty_ldisc_lock(tty2, timeout);
+ ret = __tty_ldisc_lock(tty2, timeout);
if (ret) {
- ret = tty_ldisc_lock_nested(tty, timeout);
+ ret = __tty_ldisc_lock_nested(tty, timeout);
if (!ret)
- tty_ldisc_unlock(tty2);
+ __tty_ldisc_unlock(tty2);
}
} else
- ret = tty_ldisc_lock(tty, timeout);
+ ret = __tty_ldisc_lock(tty, timeout);
}
if (!ret)
@@ -370,9 +370,9 @@ tty_ldisc_lock_pair(struct tty_struct *tty, struct tty_struct *tty2)
static void __lockfunc tty_ldisc_unlock_pair(struct tty_struct *tty,
struct tty_struct *tty2)
{
- tty_ldisc_unlock(tty);
+ __tty_ldisc_unlock(tty);
if (tty2)
- tty_ldisc_unlock(tty2);
+ __tty_ldisc_unlock(tty2);
}
static void __lockfunc tty_ldisc_enable_pair(struct tty_struct *tty,
--
2.1.1
next prev parent reply other threads:[~2014-10-16 21:00 UTC|newest]
Thread overview: 66+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-10-16 20:24 [PATCH -next 00/27] tty locking changes Peter Hurley
2014-10-16 20:24 ` [PATCH -next 01/27] tty: Don't hold tty_lock for ldisc release Peter Hurley
2014-10-16 20:25 ` [PATCH -next 02/27] tty: Invert tty_lock/ldisc_sem lock order Peter Hurley
2014-10-16 20:25 ` [PATCH -next 03/27] tty: Remove TTY_HUPPING Peter Hurley
2014-10-16 20:25 ` [PATCH -next 04/27] tty: Clarify re-open behavior of master ptys Peter Hurley
2014-10-16 20:25 ` [PATCH -next 05/27] tty: Check tty->count instead of TTY_CLOSING in tty_reopen() Peter Hurley
2014-10-16 20:25 ` [PATCH -next 06/27] pty: Always return -EIO if slave BSD pty opened first Peter Hurley
2014-10-16 20:25 ` [PATCH -next 07/27] tty: Re-open /dev/tty without tty_mutex Peter Hurley
2014-10-16 20:25 ` [PATCH -next 08/27] tty: Drop tty_mutex before tty reopen Peter Hurley
2014-10-16 20:25 ` [PATCH -next 09/27] tty: Remove TTY_CLOSING Peter Hurley
2014-10-16 20:25 ` [PATCH -next 10/27] tty: Don't take tty_mutex for tty count changes Peter Hurley
2014-10-16 20:25 ` [PATCH -next 11/27] tty: Don't release tty locks for wait queue sanity check Peter Hurley
2014-10-22 15:29 ` One Thousand Gnomes
2014-10-22 17:34 ` Peter Hurley
2014-10-23 11:30 ` One Thousand Gnomes
2014-10-16 20:25 ` [PATCH -next 12/27] tty: Document check_tty_count() requires tty_lock held Peter Hurley
2014-10-16 20:25 ` [PATCH -next 13/27] tty: Simplify pty pair teardown logic Peter Hurley
2014-10-16 20:25 ` [PATCH -next 14/27] tty: Fold pty pair handling into tty_flush_works() Peter Hurley
2014-10-16 20:25 ` [PATCH -next 15/27] tty: Simplify tty_ldisc_release() interface Peter Hurley
2014-10-16 20:25 ` [PATCH -next 16/27] tty: Simplify tty_release_checks() interface Peter Hurley
2014-10-16 20:25 ` [PATCH -next 17/27] tty: Simplify tty_release() state checks Peter Hurley
2014-10-16 20:25 ` [PATCH -next 18/27] tty: Change tty lock order to master->slave Peter Hurley
2014-10-16 20:25 ` [PATCH -next 19/27] tty: Remove tty_unhangup() declaration Peter Hurley
2014-10-16 20:25 ` [PATCH -next 20/27] tty: Refactor __tty_hangup to enable lockdep annotation Peter Hurley
2014-10-27 22:13 ` Peter Hurley
2014-10-16 20:25 ` [PATCH -next 21/27] pty: Don't drop pty master tty lock to hangup slave Peter Hurley
2014-10-16 20:25 ` [PATCH -next 22/27] tty: Document hangup call tree Peter Hurley
2014-10-16 20:25 ` [PATCH -next 23/27] pty, n_tty: Simplify input processing on final close Peter Hurley
2014-10-16 20:25 ` Peter Hurley [this message]
2014-10-16 20:25 ` [PATCH -next 25/27] tty: Fix hung task on pty hangup Peter Hurley
2014-10-16 20:25 ` [PATCH -next 26/27] tty: Fix timeout on pty set ldisc Peter Hurley
2014-10-16 20:25 ` [PATCH -next 27/27] tty: Flush ldisc buffer atomically with tty flip buffers Peter Hurley
2014-10-22 15:31 ` [PATCH -next 00/27] tty locking changes One Thousand Gnomes
2014-11-05 17:12 ` [PATCH -next v2 00/26] " Peter Hurley
2014-11-05 17:12 ` [PATCH -next v2 01/26] tty: Don't hold tty_lock for ldisc release Peter Hurley
2014-11-05 17:12 ` [PATCH -next v2 02/26] tty: Invert tty_lock/ldisc_sem lock order Peter Hurley
2014-11-05 17:12 ` [PATCH -next v2 03/26] tty: Remove TTY_HUPPING Peter Hurley
2014-11-05 17:12 ` [PATCH -next v2 04/26] tty: Clarify re-open behavior of master ptys Peter Hurley
2014-11-05 17:12 ` [PATCH -next v2 05/26] tty: Check tty->count instead of TTY_CLOSING in tty_reopen() Peter Hurley
2014-11-05 17:12 ` [PATCH -next v2 06/26] pty: Always return -EIO if slave BSD pty opened first Peter Hurley
2014-11-05 17:12 ` [PATCH -next v2 07/26] tty: Re-open /dev/tty without tty_mutex Peter Hurley
2014-11-05 17:12 ` [PATCH -next v2 08/26] tty: Drop tty_mutex before tty reopen Peter Hurley
2014-11-05 17:12 ` [PATCH -next v2 09/26] tty: Remove TTY_CLOSING Peter Hurley
2014-11-05 17:12 ` [PATCH -next v2 10/26] tty: Don't take tty_mutex for tty count changes Peter Hurley
2014-11-06 2:33 ` Greg Kroah-Hartman
2014-11-06 2:39 ` Peter Hurley
2014-11-06 2:50 ` Peter Hurley
2014-11-06 3:46 ` Greg Kroah-Hartman
2014-11-05 17:12 ` [PATCH -next v2 11/26] tty: Don't release tty locks for wait queue sanity check Peter Hurley
2014-11-06 2:40 ` Greg Kroah-Hartman
2014-11-05 17:12 ` [PATCH -next v2 12/26] tty: Document check_tty_count() requires tty_lock held Peter Hurley
2014-11-05 17:12 ` [PATCH -next v2 13/26] tty: Simplify pty pair teardown logic Peter Hurley
2014-11-05 17:12 ` [PATCH -next v2 14/26] tty: Fold pty pair handling into tty_flush_works() Peter Hurley
2014-11-05 17:12 ` [PATCH -next v2 15/26] tty: Simplify tty_ldisc_release() interface Peter Hurley
2014-11-05 17:12 ` [PATCH -next v2 16/26] tty: Simplify tty_release_checks() interface Peter Hurley
2014-11-05 17:13 ` [PATCH -next v2 17/26] tty: Simplify tty_release() state checks Peter Hurley
2014-11-05 17:13 ` [PATCH -next v2 18/26] tty: Change tty lock order to master->slave Peter Hurley
2014-11-05 17:13 ` [PATCH -next v2 19/26] tty: Preset lock subclass for nested tty locks Peter Hurley
2014-11-05 17:13 ` [PATCH -next v2 20/26] tty: Remove tty_unhangup() declaration Peter Hurley
2014-11-05 17:13 ` [PATCH -next v2 21/26] pty: Don't drop pty master tty lock to hangup slave Peter Hurley
2014-11-11 15:49 ` One Thousand Gnomes
2014-11-05 17:13 ` [PATCH -next v2 22/26] pty, n_tty: Simplify input processing on final close Peter Hurley
2014-11-05 17:13 ` [PATCH -next v2 23/26] tty: Prefix tty_ldisc_{lock,lock_nested,unlock} functions Peter Hurley
2014-11-05 17:13 ` [PATCH -next v2 24/26] tty: Fix hung task on pty hangup Peter Hurley
2014-11-05 17:13 ` [PATCH -next v2 25/26] tty: Fix timeout on pty set ldisc Peter Hurley
2014-11-05 17:13 ` [PATCH -next v2 26/26] tty: Flush ldisc buffer atomically with tty flip buffers Peter Hurley
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=1413491125-20134-25-git-send-email-peter@hurleysoftware.com \
--to=peter@hurleysoftware.com \
--cc=gnomes@lxorguk.ukuu.org.uk \
--cc=gregkh@linuxfoundation.org \
--cc=jslaby@suse.cz \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-serial@vger.kernel.org \
/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