pid namespaces: round up the API
The set of functions process_session, task_session, process_group and task_pgrp is confusing, as the names can be mixed with each other when looking at the code for a long time. The proposals are to * equip the functions that return the integer with _nr suffix to represent that fact, * and to make all functions work with task (not process) by making the common prefix of the same name. For monotony the routines signal_session() and set_signal_session() are replaced with task_session_nr() and set_task_session(), especially since they are only used with the explicit task->signal dereference. Signed-off-by: Pavel Emelianov <xemul@openvz.org> Acked-by: Serge E. Hallyn <serue@us.ibm.com> Cc: Kirill Korotaev <dev@openvz.org> Cc: "Eric W. Biederman" <ebiederm@xmission.com> Cc: Cedric Le Goater <clg@fr.ibm.com> Cc: Herbert Poetzl <herbert@13thfloor.at> Cc: Sukadev Bhattiprolu <sukadev@us.ibm.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:

committed by
Linus Torvalds

parent
858d72ead4
commit
a47afb0f9d
@@ -1172,8 +1172,8 @@ static int irix_core_dump(long signr, struct pt_regs *regs, struct file *file, u
|
||||
prstatus.pr_sighold = current->blocked.sig[0];
|
||||
psinfo.pr_pid = prstatus.pr_pid = current->pid;
|
||||
psinfo.pr_ppid = prstatus.pr_ppid = current->parent->pid;
|
||||
psinfo.pr_pgrp = prstatus.pr_pgrp = process_group(current);
|
||||
psinfo.pr_sid = prstatus.pr_sid = process_session(current);
|
||||
psinfo.pr_pgrp = prstatus.pr_pgrp = task_pgrp_nr(current);
|
||||
psinfo.pr_sid = prstatus.pr_sid = task_session_nr(current);
|
||||
if (current->pid == current->tgid) {
|
||||
/*
|
||||
* This is the record for the group leader. Add in the
|
||||
|
@@ -609,7 +609,7 @@ repeat:
|
||||
p = list_entry(_p, struct task_struct, sibling);
|
||||
if ((type == IRIX_P_PID) && p->pid != pid)
|
||||
continue;
|
||||
if ((type == IRIX_P_PGID) && process_group(p) != pid)
|
||||
if ((type == IRIX_P_PGID) && task_pgrp_nr(p) != pid)
|
||||
continue;
|
||||
if ((p->exit_signal != SIGCHLD))
|
||||
continue;
|
||||
|
@@ -763,11 +763,11 @@ asmlinkage int irix_setpgrp(int flags)
|
||||
printk("[%s:%d] setpgrp(%d) ", current->comm, current->pid, flags);
|
||||
#endif
|
||||
if(!flags)
|
||||
error = process_group(current);
|
||||
error = task_pgrp_nr(current);
|
||||
else
|
||||
error = sys_setsid();
|
||||
#ifdef DEBUG_PROCGRPS
|
||||
printk("returning %d\n", process_group(current));
|
||||
printk("returning %d\n", task_pgrp_nr(current));
|
||||
#endif
|
||||
|
||||
return error;
|
||||
|
Reference in New Issue
Block a user