Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 11d9befd authored by Peter Hurley's avatar Peter Hurley Committed by Greg Kroah-Hartman
Browse files

tty: Reorder proc_set_tty() and related fns 



Move the controlling tty-related functions and remove forward
declarations for __proc_set_tty() and proc_set_tty().

Signed-off-by: default avatarPeter Hurley <peter@hurleysoftware.com>
Reviewed-by: default avatarAlan Cox <alan@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 8f166e00

drivers/tty/tty_io.c

+62 −63
Original line number Diff line number Diff line
@@ -153,8 +153,6 @@ static long tty_compat_ioctl(struct file *file, unsigned int cmd, 
static int __tty_fasync(int fd, struct file *filp, int on);

static int tty_fasync(int fd, struct file *filp, int on);

static void release_tty(struct tty_struct *tty, int idx);

static void __proc_set_tty(struct task_struct *tsk, struct tty_struct *tty);

static void proc_set_tty(struct task_struct *tsk, struct tty_struct *tty);



/**

 *	free_tty_struct		-	free a disused tty
@@ -492,6 +490,68 @@ static const struct file_operations hung_up_tty_fops = { 
static DEFINE_SPINLOCK(redirect_lock);

static struct file *redirect;





void proc_clear_tty(struct task_struct *p)

{

	unsigned long flags;

	struct tty_struct *tty;

	spin_lock_irqsave(&p->sighand->siglock, flags);

	tty = p->signal->tty;

	p->signal->tty = NULL;

	spin_unlock_irqrestore(&p->sighand->siglock, flags);

	tty_kref_put(tty);

}



/* Called under the sighand lock */



static void __proc_set_tty(struct task_struct *tsk, struct tty_struct *tty)

{

	if (tty) {

		unsigned long flags;

		/* We should not have a session or pgrp to put here but.... */

		spin_lock_irqsave(&tty->ctrl_lock, flags);

		put_pid(tty->session);

		put_pid(tty->pgrp);

		tty->pgrp = get_pid(task_pgrp(tsk));

		spin_unlock_irqrestore(&tty->ctrl_lock, flags);

		tty->session = get_pid(task_session(tsk));

		if (tsk->signal->tty) {

			printk(KERN_DEBUG "tty not NULL!!\n");

			tty_kref_put(tsk->signal->tty);

		}

	}

	put_pid(tsk->signal->tty_old_pgrp);

	tsk->signal->tty = tty_kref_get(tty);

	tsk->signal->tty_old_pgrp = NULL;

}



static void proc_set_tty(struct task_struct *tsk, struct tty_struct *tty)

{

	spin_lock_irq(&tsk->sighand->siglock);

	__proc_set_tty(tsk, tty);

	spin_unlock_irq(&tsk->sighand->siglock);

}



struct tty_struct *get_current_tty(void)

{

	struct tty_struct *tty;

	unsigned long flags;



	spin_lock_irqsave(&current->sighand->siglock, flags);

	tty = tty_kref_get(current->signal->tty);

	spin_unlock_irqrestore(&current->sighand->siglock, flags);

	return tty;

}

EXPORT_SYMBOL_GPL(get_current_tty);



static void session_clear_tty(struct pid *session)

{

	struct task_struct *p;

	do_each_pid_task(session, PIDTYPE_SID, p) {

		proc_clear_tty(p);

	} while_each_pid_task(session, PIDTYPE_SID, p);

}



/**

 *	tty_wakeup	-	request more data

 *	@tty: terminal
@@ -792,14 +852,6 @@ int tty_hung_up_p(struct file *filp) 


EXPORT_SYMBOL(tty_hung_up_p);



static void session_clear_tty(struct pid *session)

{

	struct task_struct *p;

	do_each_pid_task(session, PIDTYPE_SID, p) {

		proc_clear_tty(p);

	} while_each_pid_task(session, PIDTYPE_SID, p);

}



/**

 *	disassociate_ctty	-	disconnect controlling tty

 *	@on_exit: true if exiting so need to "hang up" the session
@@ -3426,59 +3478,6 @@ dev_t tty_devnum(struct tty_struct *tty) 
}

EXPORT_SYMBOL(tty_devnum);



void proc_clear_tty(struct task_struct *p)

{

	unsigned long flags;

	struct tty_struct *tty;

	spin_lock_irqsave(&p->sighand->siglock, flags);

	tty = p->signal->tty;

	p->signal->tty = NULL;

	spin_unlock_irqrestore(&p->sighand->siglock, flags);

	tty_kref_put(tty);

}



/* Called under the sighand lock */



static void __proc_set_tty(struct task_struct *tsk, struct tty_struct *tty)

{

	if (tty) {

		unsigned long flags;

		/* We should not have a session or pgrp to put here but.... */

		spin_lock_irqsave(&tty->ctrl_lock, flags);

		put_pid(tty->session);

		put_pid(tty->pgrp);

		tty->pgrp = get_pid(task_pgrp(tsk));

		spin_unlock_irqrestore(&tty->ctrl_lock, flags);

		tty->session = get_pid(task_session(tsk));

		if (tsk->signal->tty) {

			printk(KERN_DEBUG "tty not NULL!!\n");

			tty_kref_put(tsk->signal->tty);

		}

	}

	put_pid(tsk->signal->tty_old_pgrp);

	tsk->signal->tty = tty_kref_get(tty);

	tsk->signal->tty_old_pgrp = NULL;

}



static void proc_set_tty(struct task_struct *tsk, struct tty_struct *tty)

{

	spin_lock_irq(&tsk->sighand->siglock);

	__proc_set_tty(tsk, tty);

	spin_unlock_irq(&tsk->sighand->siglock);

}



struct tty_struct *get_current_tty(void)

{

	struct tty_struct *tty;

	unsigned long flags;



	spin_lock_irqsave(&current->sighand->siglock, flags);

	tty = tty_kref_get(current->signal->tty);

	spin_unlock_irqrestore(&current->sighand->siglock, flags);

	return tty;

}

EXPORT_SYMBOL_GPL(get_current_tty);



void tty_default_fops(struct file_operations *fops)

{

	*fops = tty_fops;