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

Commit 8520d7c7 authored by Oleg Nesterov's avatar Oleg Nesterov Committed by Linus Torvalds
Browse files

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: default avatarOleg Nesterov <oleg@tv-sign.ru>
Acked-by: default avatar"Eric W. Biederman" <ebiederm@xmission.com>
Acked-by: default avatarPavel Emelyanov <xemul@openvz.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent e4cc0a9c

include/linux/sched.h

+1 −1
Original line number Diff line number Diff line
@@ -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,

		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. */

extern struct user_struct * alloc_uid(struct user_namespace *, uid_t);

init/main.c

+1 −1
Original line number Diff line number Diff line
@@ -833,7 +833,7 @@ static int __init kernel_init(void * unused) 
	 */

	init_pid_ns.child_reaper = current;



	__set_special_pids(1, 1);

	__set_special_pids(task_pid(current));

	cad_pid = task_pid(current);



	smp_prepare_cpus(setup_max_cpus);

kernel/exit.c

+15 −15
Original line number Diff line number Diff line
@@ -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(&current->files->count);

kernel/sys.c

+1 −1
Original line number Diff line number Diff line
@@ -1065,7 +1065,7 @@ asmlinkage long sys_setsid(void) 
		goto out;



	group_leader->signal->leader = 1;

	__set_special_pids(pid_nr(sid), pid_nr(sid));

	__set_special_pids(sid);



	spin_lock(&group_leader->sighand->siglock);

	group_leader->signal->tty = NULL;