From: Jonathan Corbet <corbet@lwn.net>
Date: Thu, 19 Jun 2008 22:04:53 +0000 (-0600)
Subject: tty_io: fasync BKL pushdown
X-Git-Tag: v2.6.27-rc1~1103^2~9
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=5d1e3230f4b4a93c6561b0fb5a99bb1eb02227ed;p=linux-2.6-omap-h63xx.git

tty_io: fasync BKL pushdown

Signed-off-by: Jonathan Corbet <corbet@lwn.net>
---

diff --git a/drivers/char/tty_io.c b/drivers/char/tty_io.c
index fd182f2e4a6..eda27899372 100644
--- a/drivers/char/tty_io.c
+++ b/drivers/char/tty_io.c
@@ -2909,15 +2909,16 @@ static int tty_fasync(int fd, struct file *filp, int on)
 {
 	struct tty_struct *tty;
 	unsigned long flags;
-	int retval;
+	int retval = 0;
 
+	lock_kernel();
 	tty = (struct tty_struct *)filp->private_data;
 	if (tty_paranoia_check(tty, filp->f_path.dentry->d_inode, "tty_fasync"))
-		return 0;
+		goto out;
 
 	retval = fasync_helper(fd, filp, on, &tty->fasync);
 	if (retval <= 0)
-		return retval;
+		goto out;
 
 	if (on) {
 		enum pid_type type;
@@ -2935,12 +2936,15 @@ static int tty_fasync(int fd, struct file *filp, int on)
 		spin_unlock_irqrestore(&tty->ctrl_lock, flags);
 		retval = __f_setown(filp, pid, type, 0);
 		if (retval)
-			return retval;
+			goto out;
 	} else {
 		if (!tty->fasync && !waitqueue_active(&tty->read_wait))
 			tty->minimum_to_wake = N_TTY_BUF_SIZE;
 	}
-	return 0;
+	retval = 0;
+out:
+	unlock_kernel();
+	return retval;
 }
 
 /**