tty: Use spin_lock() inside existing critical region
The interrupt state does not need to be saved, disabled and restored here; interrupts are already off because this lock is bracketed by spin_lock_irq/spin_unlock_irq. Signed-off-by: Peter Hurley <peter@hurleysoftware.com> Acked-by: Jiri Slaby <jslaby@suse.cz> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
20cc225bab
commit
bc30c3b23b
|
@ -545,7 +545,6 @@ EXPORT_SYMBOL_GPL(tty_wakeup);
|
||||||
static int tty_signal_session_leader(struct tty_struct *tty)
|
static int tty_signal_session_leader(struct tty_struct *tty)
|
||||||
{
|
{
|
||||||
struct task_struct *p;
|
struct task_struct *p;
|
||||||
unsigned long flags;
|
|
||||||
int refs = 0;
|
int refs = 0;
|
||||||
|
|
||||||
read_lock(&tasklist_lock);
|
read_lock(&tasklist_lock);
|
||||||
|
@ -565,10 +564,10 @@ static int tty_signal_session_leader(struct tty_struct *tty)
|
||||||
__group_send_sig_info(SIGHUP, SEND_SIG_PRIV, p);
|
__group_send_sig_info(SIGHUP, SEND_SIG_PRIV, p);
|
||||||
__group_send_sig_info(SIGCONT, SEND_SIG_PRIV, p);
|
__group_send_sig_info(SIGCONT, SEND_SIG_PRIV, p);
|
||||||
put_pid(p->signal->tty_old_pgrp); /* A noop */
|
put_pid(p->signal->tty_old_pgrp); /* A noop */
|
||||||
spin_lock_irqsave(&tty->ctrl_lock, flags);
|
spin_lock(&tty->ctrl_lock);
|
||||||
if (tty->pgrp)
|
if (tty->pgrp)
|
||||||
p->signal->tty_old_pgrp = get_pid(tty->pgrp);
|
p->signal->tty_old_pgrp = get_pid(tty->pgrp);
|
||||||
spin_unlock_irqrestore(&tty->ctrl_lock, flags);
|
spin_unlock(&tty->ctrl_lock);
|
||||||
spin_unlock_irq(&p->sighand->siglock);
|
spin_unlock_irq(&p->sighand->siglock);
|
||||||
} while_each_pid_task(tty->session, PIDTYPE_SID, p);
|
} while_each_pid_task(tty->session, PIDTYPE_SID, p);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue