diff options
| author | Pavel Emelyanov <xemul@openvz.org> | 2007-10-19 08:40:17 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-19 20:53:40 +0200 |
| commit | 19b9b9b54e5f115907efd56be2c3799775a46561 (patch) | |
| tree | 44340df34980166373f2a57c1283c26026682a95 | |
| parent | Uninline find_task_by_xxx set of functions (diff) | |
| download | linux-19b9b9b54e5f115907efd56be2c3799775a46561.tar.xz linux-19b9b9b54e5f115907efd56be2c3799775a46561.zip | |
pid namespaces: remove the struct pid unneeded fields
Since we've switched from using pid->nr to pid->upids->nr some
fields on struct pid are no longer needed
Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Cc: Oleg Nesterov <oleg@tv-sign.ru>
Cc: Sukadev Bhattiprolu <sukadev@us.ibm.com>
Cc: Paul Menage <menage@google.com>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | include/linux/init_task.h | 3 | ||||
| -rw-r--r-- | include/linux/pid.h | 3 | ||||
| -rw-r--r-- | kernel/pid.c | 1 |
3 files changed, 0 insertions, 7 deletions
diff --git a/include/linux/init_task.h b/include/linux/init_task.h index 243e287304d0..5ac5945696a0 100644 --- a/include/linux/init_task.h +++ b/include/linux/init_task.h @@ -94,9 +94,6 @@ extern struct group_info init_groups; #define INIT_STRUCT_PID { \ .count = ATOMIC_INIT(1), \ - .nr = 0, \ - /* Don't put this struct pid in pid_hash */ \ - .pid_chain = { .next = NULL, .pprev = NULL }, \ .tasks = { \ { .first = &init_task.pids[PIDTYPE_PID].node }, \ { .first = &init_task.pids[PIDTYPE_PGID].node }, \ diff --git a/include/linux/pid.h b/include/linux/pid.h index 16644cceb946..4817c6671e77 100644 --- a/include/linux/pid.h +++ b/include/linux/pid.h @@ -57,9 +57,6 @@ struct upid { struct pid { atomic_t count; - /* Try to keep pid_chain in the same cacheline as nr for find_pid */ - int nr; - struct hlist_node pid_chain; /* lists of tasks that use this pid */ struct hlist_head tasks[PIDTYPE_MAX]; struct rcu_head rcu; diff --git a/kernel/pid.c b/kernel/pid.c index 73a60e265f52..bed9e7f80a50 100644 --- a/kernel/pid.c +++ b/kernel/pid.c @@ -263,7 +263,6 @@ struct pid *alloc_pid(struct pid_namespace *ns) get_pid_ns(ns); pid->level = ns->level; - pid->nr = pid->numbers[0].nr; atomic_set(&pid->count, 1); for (type = 0; type < PIDTYPE_MAX; ++type) INIT_HLIST_HEAD(&pid->tasks[type]); |