diff options
author | Andy Lutomirski <luto@amacapital.net> | 2013-08-22 14:39:16 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-08-27 13:52:52 -0400 |
commit | c2b1df2eb42978073ec27c99cc199d20ae48b849 (patch) | |
tree | 5b7335ad7fc7e17a26a2e724c7f1f93970bc75fc /include/linux/nsproxy.h | |
parent | d661684cf6820331feae71146c35da83d794467e (diff) |
Rename nsproxy.pid_ns to nsproxy.pid_ns_for_children
nsproxy.pid_ns is *not* the task's pid namespace. The name should clarify
that.
This makes it more obvious that setns on a pid namespace is weird --
it won't change the pid namespace shown in procfs.
Signed-off-by: Andy Lutomirski <luto@amacapital.net>
Reviewed-by: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux/nsproxy.h')
-rw-r--r-- | include/linux/nsproxy.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/include/linux/nsproxy.h b/include/linux/nsproxy.h index 10e5947491c7..b4ec59d159ac 100644 --- a/include/linux/nsproxy.h +++ b/include/linux/nsproxy.h | |||
@@ -14,6 +14,10 @@ struct fs_struct; | |||
14 | * A structure to contain pointers to all per-process | 14 | * A structure to contain pointers to all per-process |
15 | * namespaces - fs (mount), uts, network, sysvipc, etc. | 15 | * namespaces - fs (mount), uts, network, sysvipc, etc. |
16 | * | 16 | * |
17 | * The pid namespace is an exception -- it's accessed using | ||
18 | * task_active_pid_ns. The pid namespace here is the | ||
19 | * namespace that children will use. | ||
20 | * | ||
17 | * 'count' is the number of tasks holding a reference. | 21 | * 'count' is the number of tasks holding a reference. |
18 | * The count for each namespace, then, will be the number | 22 | * The count for each namespace, then, will be the number |
19 | * of nsproxies pointing to it, not the number of tasks. | 23 | * of nsproxies pointing to it, not the number of tasks. |
@@ -27,7 +31,7 @@ struct nsproxy { | |||
27 | struct uts_namespace *uts_ns; | 31 | struct uts_namespace *uts_ns; |
28 | struct ipc_namespace *ipc_ns; | 32 | struct ipc_namespace *ipc_ns; |
29 | struct mnt_namespace *mnt_ns; | 33 | struct mnt_namespace *mnt_ns; |
30 | struct pid_namespace *pid_ns; | 34 | struct pid_namespace *pid_ns_for_children; |
31 | struct net *net_ns; | 35 | struct net *net_ns; |
32 | }; | 36 | }; |
33 | extern struct nsproxy init_nsproxy; | 37 | extern struct nsproxy init_nsproxy; |