cleanup find_task_by_pid variants
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.
include/linux/sched.h +0 -6
@@ -1837,9 +1837,6 @@ extern struct pid_namespace init_pid_ns;/* * 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(): * finds a task by its pid in the specified namespace * find_task_by_vpid():
@@ -1848,9 +1845,6 @@ extern struct pid_namespace init_pid_ns;* 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_pid_ns (pid_t nr,struct pid_namespace *ns);
kernel/pid.c +3 -14
@@ -378,26 +378,15 @@ EXPORT_SYMBOL(pid_task);/* * 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 pid_namespace *ns) +struct task_struct *find_task_by_pid_ns (pid_t nr,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) { -return find_task_by_pid_type_ns (PIDTYPE_PID , vnr, - 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); +return find_task_by_pid_ns (vnr, current->nsproxy->pid_ns); } -EXPORT_SYMBOL (find_task_by_pid_ns);struct pid *get_task_pid (struct task_struct *task,enum pid_type type) {
Is anyone going to pick this up?
Quoted 65 lines · Christoph Hellwig
find_task_by_pid_type_nsis only used to implementfind_task_by_vpidandfind_task_by_pid_ns, but both of them passPIDTYPE_PIDas first argument. So just foldfind_task_by_pid_type_nsintofind_task_by_pid_nsand usefind_task_by_pid_nsto implementfind_task_by_vpid.While we're at it also remove the exports for
find_task_by_pid_nsandfind_task_by_vpid- we don't have any modular callers left as the only modular caller of he old pre pid namespacefind_task_by_pid(gfs2) was switched topid_taskwhich operates on a struct pid pointer instead of apid_t. Given the confusion aboutpid_tvalues 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 <[email protected]>Index:
linux-2.6/include/linux/sched.h
===================================================================include/linux/sched.h +0
-6@@ -1837,9 +1837,6 @@ extern struct pid_namespace init_pid_ns;/* * 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(): * finds a task by its pid in the specified namespace * find_task_by_vpid(): @@ -1848,9 +1845,6 @@ extern struct pid_namespace init_pid_ns;* 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_pid_ns (pid_t nr,struct pid_namespace *ns);Index:
linux-2.6/kernel/pid.c
===================================================================kernel/pid.c +2
-9@@ -378,26 +378,15 @@ EXPORT_SYMBOL(pid_task);/* * 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 pid_namespace *ns) +struct task_struct *find_task_by_pid_ns (pid_t nr,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) { -return find_task_by_pid_type_ns (PIDTYPE_PID , vnr, - current->nsproxy->pid_ns); -} -EXPORT_SYMBOL (find_task_by_vpid);
kernel/pid.c EXPORT_SYMBOL(pid_task); · line 392
Quoted 10 lines
kernel/pid.c +1
-5- -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); +return find_task_by_pid_ns (vnr, current->nsproxy->pid_ns); } -EXPORT_SYMBOL (find_task_by_pid_ns);struct pid *get_task_pid (struct task_struct *task,enum pid_type type) {
---end quoted text---
Quoted 17 lines · On Tue, 16 Jun 2009 21:18:32 +0200 Christoph Hellwig <[email protected]> wrote:
Quoted 6 lines · Christoph Hellwig
find_task_by_pid_type_nsis only used to implementfind_task_by_vpidandfind_task_by_pid_ns, but both of them passPIDTYPE_PIDas first argument. So just foldfind_task_by_pid_type_nsintofind_task_by_pid_nsand usefind_task_by_pid_nsto implementfind_task_by_vpid.Quoted 8 lines
While we're at it also remove the exports for
find_task_by_pid_nsandfind_task_by_vpid- we don't have any modular callers left as the only modular caller of he old pre pid namespacefind_task_by_pid(gfs2) was switched topid_taskwhich operates on a struct pid pointer instead of apid_t. Given the confusion aboutpid_tvalues vs namespace that's generally the better option anyway and I think we're better of restricting modules to do it that way.
Quoted 1 line
Is anyone going to pick this up?
I already did: http://userweb.kernel.org/~akpm/mmotm/broken-out/pids-clean-up-find_task_by_pid-variants.patch