|
@@ -2571,7 +2571,6 @@ static int tiocspgrp(struct tty_struct *tty, struct tty_struct *real_tty, pid_t
|
|
struct pid *pgrp;
|
|
struct pid *pgrp;
|
|
pid_t pgrp_nr;
|
|
pid_t pgrp_nr;
|
|
int retval = tty_check_change(real_tty);
|
|
int retval = tty_check_change(real_tty);
|
|
- unsigned long flags;
|
|
|
|
|
|
|
|
if (retval == -EIO)
|
|
if (retval == -EIO)
|
|
return -ENOTTY;
|
|
return -ENOTTY;
|
|
@@ -2594,10 +2593,10 @@ static int tiocspgrp(struct tty_struct *tty, struct tty_struct *real_tty, pid_t
|
|
if (session_of_pgrp(pgrp) != task_session(current))
|
|
if (session_of_pgrp(pgrp) != task_session(current))
|
|
goto out_unlock;
|
|
goto out_unlock;
|
|
retval = 0;
|
|
retval = 0;
|
|
- spin_lock_irqsave(&tty->ctrl_lock, flags);
|
|
|
|
|
|
+ spin_lock_irq(&tty->ctrl_lock);
|
|
put_pid(real_tty->pgrp);
|
|
put_pid(real_tty->pgrp);
|
|
real_tty->pgrp = get_pid(pgrp);
|
|
real_tty->pgrp = get_pid(pgrp);
|
|
- spin_unlock_irqrestore(&tty->ctrl_lock, flags);
|
|
|
|
|
|
+ spin_unlock_irq(&tty->ctrl_lock);
|
|
out_unlock:
|
|
out_unlock:
|
|
rcu_read_unlock();
|
|
rcu_read_unlock();
|
|
return retval;
|
|
return retval;
|