diff options
| author | Eric W. Biederman <ebiederm@xmission.com> | 2012-07-26 06:24:06 -0700 |
|---|---|---|
| committer | Eric W. Biederman <ebiederm@xmission.com> | 2012-11-20 04:18:13 -0800 |
| commit | cde1975bc242f3e1072bde623ef378e547b73f91 (patch) | |
| tree | 2c40083144c71d2aa2be39ed65f610570261f647 /fs/proc | |
| parent | 4c44aaafa8108f584831850ab48a975e971db2de (diff) | |
| download | linux-3.10-cde1975bc242f3e1072bde623ef378e547b73f91.tar.gz linux-3.10-cde1975bc242f3e1072bde623ef378e547b73f91.tar.bz2 linux-3.10-cde1975bc242f3e1072bde623ef378e547b73f91.zip | |
userns: Implent proc namespace operations
This allows entering a user namespace, and the ability
to store a reference to a user namespace with a bind
mount.
Addition of missing userns_ns_put in userns_install
from Gao feng <gaofeng@cn.fujitsu.com>
Acked-by: Serge Hallyn <serge.hallyn@canonical.com>
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Diffstat (limited to 'fs/proc')
| -rw-r--r-- | fs/proc/namespaces.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/fs/proc/namespaces.c b/fs/proc/namespaces.c index 2a17fd9ae6a..030250c27d7 100644 --- a/fs/proc/namespaces.c +++ b/fs/proc/namespaces.c @@ -11,6 +11,7 @@ #include <net/net_namespace.h> #include <linux/ipc_namespace.h> #include <linux/pid_namespace.h> +#include <linux/user_namespace.h> #include "internal.h" @@ -27,6 +28,9 @@ static const struct proc_ns_operations *ns_entries[] = { #ifdef CONFIG_PID_NS &pidns_operations, #endif +#ifdef CONFIG_USER_NS + &userns_operations, +#endif &mntns_operations, }; |