iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

teach set_special_pids() to use struct pid

Browse Source 
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:
Oleg Nesterov 2008-02-08 04:19:09 -08:00 committed by Linus Torvalds
parent e4cc0a9c87
commit 8520d7c7f8
4 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/linux/sched.h
View File

@ -1632,7 +1632,7 @@ extern struct task_struct *find_task_by_vpid(pid_t nr);
extern struct task_struct *find_task_by_pid_ns(pid_t nr, extern struct task_struct *find_task_by_pid_ns(pid_t nr,
struct pid_namespace *ns); struct pid_namespace *ns);
extern void __set_special_pids(pid_t session, pid_t pgrp); extern void __set_special_pids(struct pid *pid);
/* per-UID process charging. */ /* per-UID process charging. */
extern struct user_struct * alloc_uid(struct user_namespace *, uid_t); extern struct user_struct * alloc_uid(struct user_namespace *, uid_t);

2
init/main.c
View File

@ -833,7 +833,7 @@ static int __init kernel_init(void * unused)
*/ */
init_pid_ns.child_reaper = current; init_pid_ns.child_reaper = current;
__set_special_pids(1, 1); __set_special_pids(task_pid(current));
cad_pid = task_pid(current); cad_pid = task_pid(current);
smp_prepare_cpus(setup_max_cpus); smp_prepare_cpus(setup_max_cpus);

30
kernel/exit.c
View File

@ -293,26 +293,27 @@ static void reparent_to_kthreadd(void)
switch_uid(INIT_USER); 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; 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); detach_pid(curr, PIDTYPE_SID);
set_task_session(curr, session); attach_pid(curr, PIDTYPE_SID, pid);
attach_pid(curr, PIDTYPE_SID, find_pid(session)); set_task_session(curr, nr);
} }
if (task_pgrp_nr(curr) != pgrp) { if (task_pgrp(curr) != pid) {
detach_pid(curr, PIDTYPE_PGID); detach_pid(curr, PIDTYPE_PGID);
set_task_pgrp(curr, pgrp); attach_pid(curr, PIDTYPE_PGID, pid);
attach_pid(curr, PIDTYPE_PGID, find_pid(pgrp)); 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); write_lock_irq(&tasklist_lock);
__set_special_pids(session, pgrp); __set_special_pids(pid);
write_unlock_irq(&tasklist_lock); write_unlock_irq(&tasklist_lock);
} }
@ -383,7 +384,11 @@ void daemonize(const char *name, ...)
*/ */
current->flags |= PF_NOFREEZE; 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); proc_clear_tty(current);
/* Block and flush all signals */ /* Block and flush all signals */
@ -398,11 +403,6 @@ void daemonize(const char *name, ...)
current->fs = fs; current->fs = fs;
atomic_inc(&fs->count); 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); exit_files(current);
current->files = init_task.files; current->files = init_task.files;
atomic_inc(&current->files->count); atomic_inc(&current->files->count);

2
kernel/sys.c
View File

@ -1065,7 +1065,7 @@ asmlinkage long sys_setsid(void)
goto out; goto out;
group_leader->signal->leader = 1; group_leader->signal->leader = 1;
__set_special_pids(pid_nr(sid), pid_nr(sid)); __set_special_pids(sid);
spin_lock(&group_leader->sighand->siglock); spin_lock(&group_leader->sighand->siglock);
group_leader->signal->tty = NULL; group_leader->signal->tty = NULL;