From: Alan Cox <alan@linux.intel.com>
Date: Mon, 30 Nov 2009 13:18:40 +0000 (+0000)
Subject: tty: Push the bkl down a bit in the hangup code
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=38c70b27f9502c31c1d0c29676275f7362cdb0d9;p=openwrt%2Fstaging%2Fblogic.git

tty: Push the bkl down a bit in the hangup code

We know that the redirect field is handled via its own locking in all
places

Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

diff --git a/drivers/char/tty_io.c b/drivers/char/tty_io.c
index c408c81c06a0..cc941a3504d7 100644
--- a/drivers/char/tty_io.c
+++ b/drivers/char/tty_io.c
@@ -505,8 +505,6 @@ static void do_tty_hangup(struct work_struct *work)
 	if (!tty)
 		return;
 
-	/* inuse_filps is protected by the single kernel lock */
-	lock_kernel();
 
 	spin_lock(&redirect_lock);
 	if (redirect && redirect->private_data == tty) {
@@ -515,6 +513,8 @@ static void do_tty_hangup(struct work_struct *work)
 	}
 	spin_unlock(&redirect_lock);
 
+	/* inuse_filps is protected by the single kernel lock */
+	lock_kernel();
 	check_tty_count(tty, "do_tty_hangup");
 	file_list_lock();
 	/* This breaks for file handles being sent over AF_UNIX sockets ? */