[PATCH 05/13] tty: make ldisc_mutex nest under tty_lock
in [Kernel]
|
Prev: [PATCH 04/13] tty: make termios mutex nest under tty_lock
Next: [PATCH 01/13] tty: replace BKL with a new tty_lock
From: Arnd Bergmann on 4 May 2010 18:40 Signed-off-by: Arnd Bergmann <arnd(a)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 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ |