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>
This commit is contained in:
parent
228ebcbe63
commit
19b9b9b54e
|
@ -94,9 +94,6 @@ extern struct group_info init_groups;
|
||||||
|
|
||||||
#define INIT_STRUCT_PID { \
|
#define INIT_STRUCT_PID { \
|
||||||
.count = ATOMIC_INIT(1), \
|
.count = ATOMIC_INIT(1), \
|
||||||
.nr = 0, \
|
|
||||||
/* Don't put this struct pid in pid_hash */ \
|
|
||||||
.pid_chain = { .next = NULL, .pprev = NULL }, \
|
|
||||||
.tasks = { \
|
.tasks = { \
|
||||||
{ .first = &init_task.pids[PIDTYPE_PID].node }, \
|
{ .first = &init_task.pids[PIDTYPE_PID].node }, \
|
||||||
{ .first = &init_task.pids[PIDTYPE_PGID].node }, \
|
{ .first = &init_task.pids[PIDTYPE_PGID].node }, \
|
||||||
|
|
|
@ -57,9 +57,6 @@ struct upid {
|
||||||
struct pid
|
struct pid
|
||||||
{
|
{
|
||||||
atomic_t count;
|
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 */
|
/* lists of tasks that use this pid */
|
||||||
struct hlist_head tasks[PIDTYPE_MAX];
|
struct hlist_head tasks[PIDTYPE_MAX];
|
||||||
struct rcu_head rcu;
|
struct rcu_head rcu;
|
||||||
|
|
|
@ -263,7 +263,6 @@ struct pid *alloc_pid(struct pid_namespace *ns)
|
||||||
|
|
||||||
get_pid_ns(ns);
|
get_pid_ns(ns);
|
||||||
pid->level = ns->level;
|
pid->level = ns->level;
|
||||||
pid->nr = pid->numbers[0].nr;
|
|
||||||
atomic_set(&pid->count, 1);
|
atomic_set(&pid->count, 1);
|
||||||
for (type = 0; type < PIDTYPE_MAX; ++type)
|
for (type = 0; type < PIDTYPE_MAX; ++type)
|
||||||
INIT_HLIST_HEAD(&pid->tasks[type]);
|
INIT_HLIST_HEAD(&pid->tasks[type]);
|
||||||
|
|
Loading…
Reference in New Issue