tty: Move session_of_pgrp() and make static
tiocspgrp() is the lone caller of session_of_pgrp(); relocate and limit to file scope. Signed-off-by: Peter Hurley <peter@hurleysoftware.com> Reviewed-by: Alan Cox <alan@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Родитель
2c411c1102
Коммит
e1c2296c34
|
@ -2515,6 +2515,27 @@ struct pid *tty_get_pgrp(struct tty_struct *tty)
|
|||
}
|
||||
EXPORT_SYMBOL_GPL(tty_get_pgrp);
|
||||
|
||||
/*
|
||||
* This checks not only the pgrp, but falls back on the pid if no
|
||||
* satisfactory pgrp is found. I dunno - gdb doesn't work correctly
|
||||
* without this...
|
||||
*
|
||||
* The caller must hold rcu lock or the tasklist lock.
|
||||
*/
|
||||
static struct pid *session_of_pgrp(struct pid *pgrp)
|
||||
{
|
||||
struct task_struct *p;
|
||||
struct pid *sid = NULL;
|
||||
|
||||
p = pid_task(pgrp, PIDTYPE_PGID);
|
||||
if (p == NULL)
|
||||
p = pid_task(pgrp, PIDTYPE_PID);
|
||||
if (p != NULL)
|
||||
sid = task_session(p);
|
||||
|
||||
return sid;
|
||||
}
|
||||
|
||||
/**
|
||||
* tiocgpgrp - get process group
|
||||
* @tty: tty passed by user
|
||||
|
|
|
@ -411,9 +411,6 @@ extern int __kernel_text_address(unsigned long addr);
|
|||
extern int kernel_text_address(unsigned long addr);
|
||||
extern int func_ptr_is_kernel_text(void *ptr);
|
||||
|
||||
struct pid;
|
||||
extern struct pid *session_of_pgrp(struct pid *pgrp);
|
||||
|
||||
unsigned long int_sqrt(unsigned long);
|
||||
|
||||
extern void bust_spinlocks(int yes);
|
||||
|
|
|
@ -214,27 +214,6 @@ repeat:
|
|||
goto repeat;
|
||||
}
|
||||
|
||||
/*
|
||||
* This checks not only the pgrp, but falls back on the pid if no
|
||||
* satisfactory pgrp is found. I dunno - gdb doesn't work correctly
|
||||
* without this...
|
||||
*
|
||||
* The caller must hold rcu lock or the tasklist lock.
|
||||
*/
|
||||
struct pid *session_of_pgrp(struct pid *pgrp)
|
||||
{
|
||||
struct task_struct *p;
|
||||
struct pid *sid = NULL;
|
||||
|
||||
p = pid_task(pgrp, PIDTYPE_PGID);
|
||||
if (p == NULL)
|
||||
p = pid_task(pgrp, PIDTYPE_PID);
|
||||
if (p != NULL)
|
||||
sid = task_session(p);
|
||||
|
||||
return sid;
|
||||
}
|
||||
|
||||
/*
|
||||
* Determine if a process group is "orphaned", according to the POSIX
|
||||
* definition in 2.2.2.52. Orphaned process groups are not to be affected
|
||||
|
|
Загрузка…
Ссылка в новой задаче