mirror of
https://github.com/Fishwaldo/Star64_linux.git
synced 2025-06-19 13:11:14 +00:00
teach set_special_pids() to use struct pid
Change set_special_pids() to work with struct pid, not pid_t from global name space. This again speedups and imho cleanups the code, also a preparation for the next patch. Signed-off-by: Oleg Nesterov <oleg@tv-sign.ru> Acked-by: "Eric W. Biederman" <ebiederm@xmission.com> Acked-by: Pavel Emelyanov <xemul@openvz.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
e4cc0a9c87
commit
8520d7c7f8
4 changed files with 18 additions and 18 deletions
|
@ -293,26 +293,27 @@ static void reparent_to_kthreadd(void)
|
|||
switch_uid(INIT_USER);
|
||||
}
|
||||
|
||||
void __set_special_pids(pid_t session, pid_t pgrp)
|
||||
void __set_special_pids(struct pid *pid)
|
||||
{
|
||||
struct task_struct *curr = current->group_leader;
|
||||
pid_t nr = pid_nr(pid);
|
||||
|
||||
if (task_session_nr(curr) != session) {
|
||||
if (task_session(curr) != pid) {
|
||||
detach_pid(curr, PIDTYPE_SID);
|
||||
set_task_session(curr, session);
|
||||
attach_pid(curr, PIDTYPE_SID, find_pid(session));
|
||||
attach_pid(curr, PIDTYPE_SID, pid);
|
||||
set_task_session(curr, nr);
|
||||
}
|
||||
if (task_pgrp_nr(curr) != pgrp) {
|
||||
if (task_pgrp(curr) != pid) {
|
||||
detach_pid(curr, PIDTYPE_PGID);
|
||||
set_task_pgrp(curr, pgrp);
|
||||
attach_pid(curr, PIDTYPE_PGID, find_pid(pgrp));
|
||||
attach_pid(curr, PIDTYPE_PGID, pid);
|
||||
set_task_pgrp(curr, nr);
|
||||
}
|
||||
}
|
||||
|
||||
static void set_special_pids(pid_t session, pid_t pgrp)
|
||||
static void set_special_pids(struct pid *pid)
|
||||
{
|
||||
write_lock_irq(&tasklist_lock);
|
||||
__set_special_pids(session, pgrp);
|
||||
__set_special_pids(pid);
|
||||
write_unlock_irq(&tasklist_lock);
|
||||
}
|
||||
|
||||
|
@ -383,7 +384,11 @@ void daemonize(const char *name, ...)
|
|||
*/
|
||||
current->flags |= PF_NOFREEZE;
|
||||
|
||||
set_special_pids(1, 1);
|
||||
if (current->nsproxy != &init_nsproxy) {
|
||||
get_nsproxy(&init_nsproxy);
|
||||
switch_task_namespaces(current, &init_nsproxy);
|
||||
}
|
||||
set_special_pids(find_pid(1));
|
||||
proc_clear_tty(current);
|
||||
|
||||
/* Block and flush all signals */
|
||||
|
@ -398,11 +403,6 @@ void daemonize(const char *name, ...)
|
|||
current->fs = fs;
|
||||
atomic_inc(&fs->count);
|
||||
|
||||
if (current->nsproxy != init_task.nsproxy) {
|
||||
get_nsproxy(init_task.nsproxy);
|
||||
switch_task_namespaces(current, init_task.nsproxy);
|
||||
}
|
||||
|
||||
exit_files(current);
|
||||
current->files = init_task.files;
|
||||
atomic_inc(¤t->files->count);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue