Commit 369e2b84 authored Oct 16, 2014 by Peter Hurley Committed by Greg Kroah-Hartman Nov 05, 2014

tty: Remove sparse lock annotations from tty_write_lock()/_unlock()

sparse lock annotations cannot represent conditional acquire, such
as mutex_lock_interruptible() or mutex_trylock(), and produce sparse
warnings at _every_ correct call site.

Remove lock annotations from tty_write_lock() and tty_write_unlock().

Fixes sparse warnings:
drivers/tty/tty_io.c:1083:13: warning: context imbalance in 'tty_write_unlock' - wrong count at exit
drivers/tty/tty_io.c:1090:12: warning: context imbalance in 'tty_write_lock' - wrong count at exit
drivers/tty/tty_io.c:1211:17: warning: context imbalance in 'tty_write_message' - unexpected unlock
drivers/tty/tty_io.c:1233:16: warning: context imbalance in 'tty_write' - different lock contexts for basic block
drivers/tty/tty_io.c:1285:5: warning: context imbalance in 'tty_send_xchar' - different lock contexts for basic block
drivers/tty/tty_io.c:2653:12: warning: context imbalance in 'send_break' - different lock contexts for basic block

Signed-off-by: Peter Hurley <peter@hurleysoftware.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 91f189de

drivers/tty/tty_io.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -1024,14 +1024,12 @@ static ssize_t tty_read(struct file file, char __user buf, size_t count,
		}

		static void tty_write_unlock(struct tty_struct *tty)
		__releases(&tty->atomic_write_lock)
		{
		mutex_unlock(&tty->atomic_write_lock);
		wake_up_interruptible_poll(&tty->write_wait, POLLOUT);
		}

		static int tty_write_lock(struct tty_struct *tty, int ndelay)
		__acquires(&tty->atomic_write_lock)
		{
		if (!mutex_trylock(&tty->atomic_write_lock)) {
		if (ndelay)

Admin message