The Linux Kernel Mailing List
 help / color / mirror / Atom feed
From: Alan Cox <alan@linux.intel.com>
To: linux-kernel@vger.kernel.org
Subject: [PATCH 3/5] tty: Push the bkl down a bit in the hangup code
Date: Wed, 18 Nov 2009 14:26:16 +0000	[thread overview]
Message-ID: <20091118142608.3806.91703.stgit@localhost.localdomain> (raw)
In-Reply-To: <20091118142313.3806.47368.stgit@localhost.localdomain>

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

Signed-off-by: Alan Cox <alan@linux.intel.com>
---

 drivers/char/tty_io.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


diff --git a/drivers/char/tty_io.c b/drivers/char/tty_io.c
index a1b1ff6..f4a0404 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 ? */


  parent reply	other threads:[~2009-11-18 14:42 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-11-18 14:23 [RFC PATCH 0/5] tty BKL pushdown Alan Cox
2009-11-18 14:25 ` [RFC PATCH 1/5] tty: push the BKL down into the handlers a bit Alan Cox
2009-11-20 12:34   ` Dan Carpenter
2009-11-18 14:26 ` [PATCH 2/5] tty: Push the lock down further into the ldisc code Alan Cox
2009-11-18 14:26 ` Alan Cox [this message]
2009-11-18 14:26 ` [PATCH 4/5] tty: Move the leader test in disassociate Alan Cox
2009-11-18 14:26 ` [PATCH 5/5] tty: split the lock up a bit further Alan Cox

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20091118142608.3806.91703.stgit@localhost.localdomain \
    --to=alan@linux.intel.com \
    --cc=linux-kernel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox