Home » Mailing list archives » linux-kernel » 2010 » May » 4

[PATCH 05/13] tty: make ldisc_mutex nest under tty_lock

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
[view in full thread]
From: Arnd Bergmann
Subject: [PATCH 05/13] tty: make ldisc_mutex nest under tty_lock
Date: Tuesday, May 4, 2010 - 3:33 pm

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
 drivers/char/tty_io.c    |    2 +-
 drivers/char/tty_ldisc.c |   10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/char/tty_io.c b/drivers/char/tty_io.c
index b1a40a1..82c723a 100644
--- a/drivers/char/tty_io.c
+++ b/drivers/char/tty_io.c
@@ -1284,7 +1284,7 @@ static int tty_reopen(struct tty_struct *tty)
 	tty->count++;
 	tty->driver = driver; /* N.B. why do this every time?? */
 
-	mutex_lock(&tty->ldisc_mutex);
+	mutex_lock_tty_on(&tty->ldisc_mutex);
 	WARN_ON(!test_bit(TTY_LDISC, &tty->flags));
 	mutex_unlock(&tty->ldisc_mutex);
 
diff --git a/drivers/char/tty_ldisc.c b/drivers/char/tty_ldisc.c
index f0efca2..630e1ef 100644
--- a/drivers/char/tty_ldisc.c
+++ b/drivers/char/tty_ldisc.c
@@ -582,7 +582,7 @@ int tty_set_ldisc(struct tty_struct *tty, int ldisc)
 
 	tty_wait_until_sent(tty, 0);
 
-	mutex_lock(&tty->ldisc_mutex);
+	mutex_lock_tty_off(&tty->ldisc_mutex);
 
 	/*
 	 *	We could be midstream of another ldisc change which has
@@ -593,7 +593,7 @@ int tty_set_ldisc(struct tty_struct *tty, int ldisc)
 		mutex_unlock(&tty->ldisc_mutex);
 		wait_event(tty_ldisc_wait,
 			test_bit(TTY_LDISC_CHANGING, &tty->flags) == 0);
-		mutex_lock(&tty->ldisc_mutex);
+		mutex_lock_tty_off(&tty->ldisc_mutex);
 	}
 
 	tty_lock();
@@ -634,7 +634,7 @@ int tty_set_ldisc(struct tty_struct *tty, int ldisc)
 
 	flush_scheduled_work();
 
-	mutex_lock(&tty->ldisc_mutex);
+	mutex_lock_tty_off(&tty->ldisc_mutex);
 	tty_lock();
 	if (test_bit(TTY_HUPPED, &tty->flags)) {
 		/* We were raced by the hangup method. It will have stomped
@@ -781,7 +781,7 @@ void tty_ldisc_hangup(struct tty_struct *tty)
 	 *
 	 * Avoid racing set_ldisc or tty_ldisc_release
 	 */
-	mutex_lock(&tty->ldisc_mutex);
+	mutex_lock_tty_on(&tty->ldisc_mutex);
 	tty_ldisc_halt(tty);
 	/* At this point we have a closed ldisc and we want to
 	   reopen it. We could defer this to the next open but
@@ -856,7 +856,7 @@ void tty_ldisc_release(struct tty_struct *tty, struct tty_struct *o_tty)
 	tty_ldisc_halt(tty);
 	flush_scheduled_work();
 
-	mutex_lock(&tty->ldisc_mutex);
+	mutex_lock_tty_on(&tty->ldisc_mutex);
 	/*
 	 * Now kill off the ldisc
 	 */
-- 
1.7.0.4

--
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
Messages in current thread:
[PATCH v2 00/13] BKL conversion in tty layer, Arnd Bergmann, (Tue May 4, 3:33 pm)
[PATCH 01/13] tty: replace BKL with a new tty_lock, Arnd Bergmann, (Tue May 4, 3:33 pm)
[PATCH 02/13] tty: make atomic_write_lock release tty_lock, Arnd Bergmann, (Tue May 4, 3:33 pm)
[PATCH 03/13] tty: make tty_port-&gt;mutex nest under tty_lock, Arnd Bergmann, (Tue May 4, 3:33 pm)
[PATCH 04/13] tty: make termios mutex nest under tty_lock, Arnd Bergmann, (Tue May 4, 3:33 pm)
[PATCH 05/13] tty: make ldisc_mutex nest under tty_lock, Arnd Bergmann, (Tue May 4, 3:33 pm)
[PATCH 06/13] tty: never hold BTM while getting tty_mutex, Arnd Bergmann, (Tue May 4, 3:33 pm)
[PATCH 10/13] tty: untangle locking of wait_until_sent, Arnd Bergmann, (Tue May 4, 3:33 pm)
[PATCH 11/13] tty: remove tty_lock_nested, Arnd Bergmann, (Tue May 4, 3:33 pm)
[PATCH 12/13] tty: remove release_tty_lock/reacquire_tty_lock, Arnd Bergmann, (Tue May 4, 3:33 pm)
Re: [PATCH v2 00/13] BKL conversion in tty layer, Alan Cox, (Wed May 5, 3:52 am)
Re: [PATCH 02/13] tty: make atomic_write_lock release tty_lock, Alan Cox, (Wed May 5, 3:57 am)
Re: [PATCH v2 00/13] BKL conversion in tty layer, Arnd Bergmann, (Wed May 5, 5:24 am)
Re: [PATCH 04/13] tty: make termios mutex nest under tty_lock, Arnd Bergmann, (Wed May 5, 9:11 am)
Re: [PATCH 10/13] tty: untangle locking of wait_until_sent, Alan Cox, (Wed May 5, 12:59 pm)
Re: [PATCH 10/13] tty: untangle locking of wait_until_sent, Arnd Bergmann, (Wed May 5, 2:31 pm)
Re: [PATCH 10/13] tty: untangle locking of wait_until_sent, Greg KH, (Wed May 5, 3:51 pm)
Re: [PATCH 10/13] tty: untangle locking of wait_until_sent, Alan Cox, (Wed May 5, 4:52 pm)
Re: [PATCH 10/13] tty: untangle locking of wait_until_sent, Pavel Machek, (Mon May 24, 12:00 pm)
Re: [PATCH 10/13] tty: untangle locking of wait_until_sent, Alan Cox, (Mon May 24, 1:27 pm)