[PATCH] rename struct namespace to struct mnt_namespace

Rename 'struct namespace' to 'struct mnt_namespace' to avoid confusion with
other namespaces being developped for the containers : pid, uts, ipc, etc.
'namespace' variables and attributes are also renamed to 'mnt_ns'

Signed-off-by: Kirill Korotaev <dev@sw.ru>
Signed-off-by: Cedric Le Goater <clg@fr.ibm.com>
Cc: Eric W. Biederman <ebiederm@xmission.com>
Cc: Herbert Poetzl <herbert@13thfloor.at>
Cc: Sukadev Bhattiprolu <sukadev@us.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 8 insertions, 8 deletions

diff --git a/kernel/nsproxy.c b/kernel/nsproxy.c
index 674aceb7335a..bd9cb435dfe0 100644
--- a/kernel/nsproxy.c
+++ b/kernel/nsproxy.c
@@ -17,7 +17,7 @@
 #include <linux/version.h>
 #include <linux/nsproxy.h>
 #include <linux/init_task.h>
-#include <linux/namespace.h>
+#include <linux/mnt_namespace.h>
 #include <linux/utsname.h>
 
 struct nsproxy init_nsproxy = INIT_NSPROXY(init_nsproxy);
@@ -60,8 +60,8 @@ struct nsproxy *dup_namespaces(struct nsproxy *orig)
         struct nsproxy *ns = clone_namespaces(orig);
 
         if (ns) {
-                if (ns->namespace)
-                        get_namespace(ns->namespace);
+                if (ns->mnt_ns)
+                        get_mnt_ns(ns->mnt_ns);
                 if (ns->uts_ns)
                         get_uts_ns(ns->uts_ns);
                 if (ns->ipc_ns)
@@ -97,7 +97,7 @@ int copy_namespaces(int flags, struct task_struct *tsk)
 
         tsk->nsproxy = new_ns;
 
-        err = copy_namespace(flags, tsk);
+        err = copy_mnt_ns(flags, tsk);
         if (err)
                 goto out_ns;
 
@@ -117,8 +117,8 @@ out_ipc:
         if (new_ns->uts_ns)
                 put_uts_ns(new_ns->uts_ns);
 out_uts:
-        if (new_ns->namespace)
-                put_namespace(new_ns->namespace);
+        if (new_ns->mnt_ns)
+                put_mnt_ns(new_ns->mnt_ns);
 out_ns:
         tsk->nsproxy = old_ns;
         kfree(new_ns);
@@ -127,8 +127,8 @@ out_ns:
 
 void free_nsproxy(struct nsproxy *ns)
 {
-                if (ns->namespace)
-                        put_namespace(ns->namespace);
+                if (ns->mnt_ns)
+                        put_mnt_ns(ns->mnt_ns);
                 if (ns->uts_ns)
                         put_uts_ns(ns->uts_ns);
                 if (ns->ipc_ns)