aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlan Cox <alan@redhat.com>2008-10-13 10:45:52 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2008-10-13 09:51:44 -0700
commita90610e50b98e18385d4fbea2c9eaefb12c5a75c (patch)
tree03fd450b5d94710105a6c6f4f3f20519fd815461
parent402fda9201ac619ea1f120996b1a142c57aeeb6b (diff)
downloadkernel_samsung_smdk4412-a90610e50b98e18385d4fbea2c9eaefb12c5a75c.zip
kernel_samsung_smdk4412-a90610e50b98e18385d4fbea2c9eaefb12c5a75c.tar.gz
kernel_samsung_smdk4412-a90610e50b98e18385d4fbea2c9eaefb12c5a75c.tar.bz2
fs3270: remove extra locks
get_current_tty now does internal locking and returns a referenced object, thus our use of tty_mutex here can go away. Signed-off-by: Alan Cox <alan@redhat.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--drivers/s390/char/fs3270.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/s390/char/fs3270.c b/drivers/s390/char/fs3270.c
index 84fbc90..1227f45 100644
--- a/drivers/s390/char/fs3270.c
+++ b/drivers/s390/char/fs3270.c
@@ -426,18 +426,14 @@ fs3270_open(struct inode *inode, struct file *filp)
minor = iminor(filp->f_path.dentry->d_inode);
/* Check for minor 0 multiplexer. */
if (minor == 0) {
- struct tty_struct *tty;
- mutex_lock(&tty_mutex);
- tty = get_current_tty();
+ struct tty_struct *tty = get_current_tty();
if (!tty || tty->driver->major != IBM_TTY3270_MAJOR) {
tty_kref_put(tty);
- mutex_unlock(&tty_mutex);
rc = -ENODEV;
goto out;
}
minor = tty->index + RAW3270_FIRSTMINOR;
tty_kref_put(tty);
- mutex_unlock(&tty_mutex);
}
/* Check if some other program is already using fullscreen mode. */
fp = (struct fs3270 *) raw3270_find_view(&fs3270_fn, minor);