GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-05 06:08:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

pids: clean up find_task_by_pid variants

Browse source 
find_task_by_pid_type_ns is only used to implement find_task_by_vpid and
find_task_by_pid_ns, but both of them pass PIDTYPE_PID as first argument.
So just fold find_task_by_pid_type_ns into find_task_by_pid_ns and use
find_task_by_pid_ns to implement find_task_by_vpid.

While we're at it also remove the exports for find_task_by_pid_ns and
find_task_by_vpid - we don't have any modular callers left as the only
modular caller of he old pre pid namespace find_task_by_pid (gfs2) was
switched to pid_task which operates on a struct pid pointer instead of a
pid_t.  Given the confusion about pid_t values vs namespace that's
generally the better option anyway and I think we're better of restricting
modules to do it that way.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Cc: Pavel Emelyanov <xemul@openvz.org>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Oleg Nesterov <oleg@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Christoph Hellwig 2009-06-17 16:27:51 -07:00 • committed by Linus Torvalds
parent 7338f29984
commit 17f98dcf60
2 changed files with 3 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
include/linux/sched.h
View file

@ -1878,9 +1878,6 @@ extern struct pid_namespace init_pid_ns;
/* /*
* find a task by one of its numerical ids * find a task by one of its numerical ids
* *
* find_task_by_pid_type_ns():
* it is the most generic call - it finds a task by all id,
* type and namespace specified
* find_task_by_pid_ns(): * find_task_by_pid_ns():
* finds a task by its pid in the specified namespace * finds a task by its pid in the specified namespace
* find_task_by_vpid(): * find_task_by_vpid():
@ -1889,9 +1886,6 @@ extern struct pid_namespace init_pid_ns;
* see also find_vpid() etc in include/linux/pid.h * see also find_vpid() etc in include/linux/pid.h
*/ */
extern struct task_struct *find_task_by_pid_type_ns(int type, int pid,
struct pid_namespace *ns);
extern struct task_struct *find_task_by_vpid(pid_t nr); 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);

17
kernel/pid.c
View file

@ -378,26 +378,15 @@ EXPORT_SYMBOL(pid_task);
/* /*
* Must be called under rcu_read_lock() or with tasklist_lock read-held. * Must be called under rcu_read_lock() or with tasklist_lock read-held.
*/ */
struct task_struct *find_task_by_pid_type_ns(int type, int nr, struct task_struct *find_task_by_pid_ns(pid_t nr, struct pid_namespace *ns)
struct pid_namespace *ns)
{ {
return pid_task(find_pid_ns(nr, ns), type); return pid_task(find_pid_ns(nr, ns), PIDTYPE_PID);
} }
EXPORT_SYMBOL(find_task_by_pid_type_ns);
struct task_struct *find_task_by_vpid(pid_t vnr) struct task_struct *find_task_by_vpid(pid_t vnr)
{ {
return find_task_by_pid_type_ns(PIDTYPE_PID, vnr, return find_task_by_pid_ns(vnr, current->nsproxy->pid_ns);
current->nsproxy->pid_ns);
} }
EXPORT_SYMBOL(find_task_by_vpid);
struct task_struct *find_task_by_pid_ns(pid_t nr, struct pid_namespace *ns)
{
return find_task_by_pid_type_ns(PIDTYPE_PID, nr, ns);
}
EXPORT_SYMBOL(find_task_by_pid_ns);
struct pid *get_task_pid(struct task_struct *task, enum pid_type type) struct pid *get_task_pid(struct task_struct *task, enum pid_type type)
{ {