iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

TTY: tty_io, annotate locking functions

Browse Source 
tty_write_lock and tty_write_unlock contain imbalanced locking. But
this is intentional, so mark them appropriately by
__acquires/__releases.

Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Jiri Slaby 2011-04-20 10:43:18 +02:00 committed by Greg Kroah-Hartman
parent c831cff256
commit 83c67571b3
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/tty/tty_io.c
View File

@ -962,12 +962,14 @@ static ssize_t tty_read(struct file *file, char __user *buf, size_t count,
} }
void tty_write_unlock(struct tty_struct *tty) void tty_write_unlock(struct tty_struct *tty)
__releases(&tty->atomic_write_lock)
{ {
mutex_unlock(&tty->atomic_write_lock); mutex_unlock(&tty->atomic_write_lock);
wake_up_interruptible_poll(&tty->write_wait, POLLOUT); wake_up_interruptible_poll(&tty->write_wait, POLLOUT);
} }
int tty_write_lock(struct tty_struct *tty, int ndelay) int tty_write_lock(struct tty_struct *tty, int ndelay)
__acquires(&tty->atomic_write_lock)
{ {
if (!mutex_trylock(&tty->atomic_write_lock)) { if (!mutex_trylock(&tty->atomic_write_lock)) {
if (ndelay) if (ndelay)