diff options
Diffstat (limited to 'include/linux/pid.h')
| -rw-r--r-- | include/linux/pid.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/include/linux/pid.h b/include/linux/pid.h index c21c7e8124a7..22921ac4cfd9 100644 --- a/include/linux/pid.h +++ b/include/linux/pid.h | |||
| @@ -48,7 +48,7 @@ enum pid_type | |||
| 48 | */ | 48 | */ |
| 49 | 49 | ||
| 50 | struct upid { | 50 | struct upid { |
| 51 | /* Try to keep pid_chain in the same cacheline as nr for find_pid */ | 51 | /* Try to keep pid_chain in the same cacheline as nr for find_vpid */ |
| 52 | int nr; | 52 | int nr; |
| 53 | struct pid_namespace *ns; | 53 | struct pid_namespace *ns; |
| 54 | struct hlist_node pid_chain; | 54 | struct hlist_node pid_chain; |
| @@ -57,10 +57,10 @@ struct upid { | |||
| 57 | struct pid | 57 | struct pid |
| 58 | { | 58 | { |
| 59 | atomic_t count; | 59 | atomic_t count; |
| 60 | unsigned int level; | ||
| 60 | /* lists of tasks that use this pid */ | 61 | /* lists of tasks that use this pid */ |
| 61 | struct hlist_head tasks[PIDTYPE_MAX]; | 62 | struct hlist_head tasks[PIDTYPE_MAX]; |
| 62 | struct rcu_head rcu; | 63 | struct rcu_head rcu; |
| 63 | unsigned int level; | ||
| 64 | struct upid numbers[1]; | 64 | struct upid numbers[1]; |
| 65 | }; | 65 | }; |
| 66 | 66 | ||
| @@ -105,14 +105,12 @@ extern struct pid_namespace init_pid_ns; | |||
| 105 | * or rcu_read_lock() held. | 105 | * or rcu_read_lock() held. |
| 106 | * | 106 | * |
| 107 | * find_pid_ns() finds the pid in the namespace specified | 107 | * find_pid_ns() finds the pid in the namespace specified |
| 108 | * find_pid() find the pid by its global id, i.e. in the init namespace | ||
| 109 | * find_vpid() finr the pid by its virtual id, i.e. in the current namespace | 108 | * find_vpid() finr the pid by its virtual id, i.e. in the current namespace |
| 110 | * | 109 | * |
| 111 | * see also find_task_by_pid() set in include/linux/sched.h | 110 | * see also find_task_by_vpid() set in include/linux/sched.h |
| 112 | */ | 111 | */ |
| 113 | extern struct pid *find_pid_ns(int nr, struct pid_namespace *ns); | 112 | extern struct pid *find_pid_ns(int nr, struct pid_namespace *ns); |
| 114 | extern struct pid *find_vpid(int nr); | 113 | extern struct pid *find_vpid(int nr); |
| 115 | extern struct pid *find_pid(int nr); | ||
| 116 | 114 | ||
| 117 | /* | 115 | /* |
| 118 | * Lookup a PID in the hash table, and return with it's count elevated. | 116 | * Lookup a PID in the hash table, and return with it's count elevated. |
