Add pid_namespace to nsproxy

Cedric Le Goater clg at fr.ibm.com
Fri Sep 8 03:30:05 PDT 2006


Sukadev Bhattiprolu wrote:

<snip>

> +++ lx26-18-rc5-mm1/include/linux/nsproxy.h	2006-09-07 22:30:22.000000000 -0700
> @@ -23,6 +23,7 @@ struct ipc_namespace;
>  struct nsproxy {
>  	atomic_t count;
>  	spinlock_t nslock;
> +	struct pid_namespace *pid_ns;
>  	struct uts_namespace *uts_ns;
>  	struct ipc_namespace *ipc_ns;
>  	struct namespace *namespace;

argh that patches conflicts with the user namespace patchset and the patch
from kirill changing namespace to mnt_namespace.

I'm maintaining a patchset on 2.6.18-rc5-mm1 with the following input.

* kthread conversion patches not yet accepted by maintainers
* ro bind mount, from dave
* user beancounter, from kirill and pavel
* network namespace, from andrey
* some extra stuff from daniel (in progress)
* mnt namespace, from kirill
* pid namespace, from suka.
* user namespace, from cedric

the last 3 patches conflicts because of nsproxy. I'm going to merge them
all, and resend on the list for inclusion in -mm.

thanks,

C.



More information about the Containers mailing list