4 files changed, 21 insertions, 20 deletions

diff --git a/kernel/exit.c b/kernel/exit.c
index 6267a6cc6113..28d9feedfd27 100644
--- a/kernel/exit.c
+++ b/kernel/exit.c
@@ -13,7 +13,7 @@
 #include <linux/completion.h>
 #include <linux/personality.h>
 #include <linux/tty.h>
-#include <linux/namespace.h>
+#include <linux/mnt_namespace.h>
 #include <linux/key.h>
 #include <linux/security.h>
 #include <linux/cpu.h>
diff --git a/kernel/fork.c b/kernel/fork.c
index 60d2644bfe85..8c859eef8e6a 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -18,7 +18,7 @@
 #include <linux/module.h>
 #include <linux/vmalloc.h>
 #include <linux/completion.h>
-#include <linux/namespace.h>
+#include <linux/mnt_namespace.h>
 #include <linux/personality.h>
 #include <linux/mempolicy.h>
 #include <linux/sem.h>
@@ -1525,17 +1525,18 @@ static int unshare_fs(unsigned long unshare_flags, struct fs_struct **new_fsp)
 }
 
 /*
- * Unshare the namespace structure if it is being shared
+ * Unshare the mnt_namespace structure if it is being shared
  */
-static int unshare_namespace(unsigned long unshare_flags, struct namespace **new_nsp, struct fs_struct *new_fs)
+static int unshare_mnt_namespace(unsigned long unshare_flags,
+                struct mnt_namespace **new_nsp, struct fs_struct *new_fs)
 {
-        struct namespace *ns = current->nsproxy->namespace;
+        struct mnt_namespace *ns = current->nsproxy->mnt_ns;
 
         if ((unshare_flags & CLONE_NEWNS) && ns) {
                 if (!capable(CAP_SYS_ADMIN))
                         return -EPERM;
 
-                *new_nsp = dup_namespace(current, new_fs ? new_fs : current->fs);
+                *new_nsp = dup_mnt_ns(current, new_fs ? new_fs : current->fs);
                 if (!*new_nsp)
                         return -ENOMEM;
         }
@@ -1623,7 +1624,7 @@ asmlinkage long sys_unshare(unsigned long unshare_flags)
 {
         int err = 0;
         struct fs_struct *fs, *new_fs = NULL;
-        struct namespace *ns, *new_ns = NULL;
+        struct mnt_namespace *ns, *new_ns = NULL;
         struct sighand_struct *new_sigh = NULL;
         struct mm_struct *mm, *new_mm = NULL, *active_mm = NULL;
         struct files_struct *fd, *new_fd = NULL;
@@ -1645,7 +1646,7 @@ asmlinkage long sys_unshare(unsigned long unshare_flags)
                 goto bad_unshare_out;
         if ((err = unshare_fs(unshare_flags, &new_fs)))
                 goto bad_unshare_cleanup_thread;
-        if ((err = unshare_namespace(unshare_flags, &new_ns, new_fs)))
+        if ((err = unshare_mnt_namespace(unshare_flags, &new_ns, new_fs)))
                 goto bad_unshare_cleanup_fs;
         if ((err = unshare_sighand(unshare_flags, &new_sigh)))
                 goto bad_unshare_cleanup_ns;
@@ -1686,8 +1687,8 @@ asmlinkage long sys_unshare(unsigned long unshare_flags)
                 }
 
                 if (new_ns) {
-                        ns = current->nsproxy->namespace;
-                        current->nsproxy->namespace = new_ns;
+                        ns = current->nsproxy->mnt_ns;
+                        current->nsproxy->mnt_ns = new_ns;
                         new_ns = ns;
                 }
 
@@ -1748,7 +1749,7 @@ bad_unshare_cleanup_sigh:
 
 bad_unshare_cleanup_ns:
         if (new_ns)
-                put_namespace(new_ns);
+                put_mnt_ns(new_ns);
 
 bad_unshare_cleanup_fs:
         if (new_fs)
diff --git a/kernel/kmod.c b/kernel/kmod.c
index 8d2bea09a4ec..3a7379aa31ca 100644
--- a/kernel/kmod.c
+++ b/kernel/kmod.c
@@ -25,7 +25,7 @@
 #include <linux/kmod.h>
 #include <linux/smp_lock.h>
 #include <linux/slab.h>
-#include <linux/namespace.h>
+#include <linux/mnt_namespace.h>
 #include <linux/completion.h>
 #include <linux/file.h>
 #include <linux/workqueue.h>
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)