From: Sukadev Bhattiprolu <sukadev@xxxxxxxxxx> Subject [RFC][PATCH 4/5] Remove nsproxy->pid_ns Remove the struct pid_namespace * field from struct nsproxy as its no longer used. Signed-off-by: Sukadev Bhattiprolu <sukadev@xxxxxxxxxx> Cc: Cedric Le Goater <clg@xxxxxxxxxx> Cc: Dave Hansen <haveblue@xxxxxxxxxx> Cc: Serge Hallyn <serue@xxxxxxxxxx> Cc: containers@xxxxxxxxxxxxxx --- include/linux/init_task.h | 1 - include/linux/nsproxy.h | 2 -- kernel/nsproxy.c | 2 -- 3 files changed, 5 deletions(-) Index: lx26-20-mm2b/include/linux/nsproxy.h =================================================================== --- lx26-20-mm2b.orig/include/linux/nsproxy.h 2007-03-09 19:00:14.000000000 -0800 +++ lx26-20-mm2b/include/linux/nsproxy.h 2007-03-09 19:01:26.000000000 -0800 @@ -7,7 +7,6 @@ struct mnt_namespace; struct uts_namespace; struct ipc_namespace; -struct pid_namespace; /* * A structure to contain pointers to all per-process @@ -27,7 +26,6 @@ struct nsproxy { struct uts_namespace *uts_ns; struct ipc_namespace *ipc_ns; struct mnt_namespace *mnt_ns; - struct pid_namespace *pid_ns; }; extern struct nsproxy init_nsproxy; Index: lx26-20-mm2b/include/linux/init_task.h =================================================================== --- lx26-20-mm2b.orig/include/linux/init_task.h 2007-03-09 19:00:11.000000000 -0800 +++ lx26-20-mm2b/include/linux/init_task.h 2007-03-09 19:01:26.000000000 -0800 @@ -72,7 +72,6 @@ extern struct nsproxy init_nsproxy; #define INIT_NSPROXY(nsproxy) { \ - .pid_ns = &init_pid_ns, \ .count = ATOMIC_INIT(1), \ .nslock = __SPIN_LOCK_UNLOCKED(nsproxy.nslock), \ .uts_ns = &init_uts_ns, \ Index: lx26-20-mm2b/kernel/nsproxy.c =================================================================== --- lx26-20-mm2b.orig/kernel/nsproxy.c 2007-03-09 19:01:09.000000000 -0800 +++ lx26-20-mm2b/kernel/nsproxy.c 2007-03-09 19:01:26.000000000 -0800 @@ -137,7 +137,5 @@ void free_nsproxy(struct nsproxy *ns) put_uts_ns(ns->uts_ns); if (ns->ipc_ns) put_ipc_ns(ns->ipc_ns); - if (ns->pid_ns) - put_pid_ns(ns->pid_ns); kfree(ns); } _______________________________________________ Containers mailing list Containers@xxxxxxxxxxxxxx https://lists.osdl.org/mailman/listinfo/containers