16 files changed, 148 insertions, 146 deletions

diff --git a/fs/afs/mntpt.c b/fs/afs/mntpt.c
index f33b1a81a761..8f74e8450826 100644
--- a/fs/afs/mntpt.c
+++ b/fs/afs/mntpt.c
@@ -18,7 +18,7 @@
 #include <linux/pagemap.h>
 #include <linux/mount.h>
 #include <linux/namei.h>
-#include <linux/namespace.h>
+#include <linux/mnt_namespace.h>
 #include "super.h"
 #include "cell.h"
 #include "volume.h"
diff --git a/fs/namespace.c b/fs/namespace.c
index b00ac84ebbdd..fde8553faa76 100644
--- a/fs/namespace.c
+++ b/fs/namespace.c
@@ -20,7 +20,7 @@
 #include <linux/module.h>
 #include <linux/sysfs.h>
 #include <linux/seq_file.h>
-#include <linux/namespace.h>
+#include <linux/mnt_namespace.h>
 #include <linux/namei.h>
 #include <linux/security.h>
 #include <linux/mount.h>
@@ -133,10 +133,10 @@ struct vfsmount *lookup_mnt(struct vfsmount *mnt, struct dentry *dentry)
 
 static inline int check_mnt(struct vfsmount *mnt)
 {
-        return mnt->mnt_namespace == current->nsproxy->namespace;
+        return mnt->mnt_ns == current->nsproxy->mnt_ns;
 }
 
-static void touch_namespace(struct namespace *ns)
+static void touch_mnt_namespace(struct mnt_namespace *ns)
 {
         if (ns) {
                 ns->event = ++event;
@@ -144,7 +144,7 @@ static void touch_namespace(struct namespace *ns)
         }
 }
 
-static void __touch_namespace(struct namespace *ns)
+static void __touch_mnt_namespace(struct mnt_namespace *ns)
 {
         if (ns && ns->event != event) {
                 ns->event = event;
@@ -187,19 +187,19 @@ static void commit_tree(struct vfsmount *mnt)
         struct vfsmount *parent = mnt->mnt_parent;
         struct vfsmount *m;
         LIST_HEAD(head);
-        struct namespace *n = parent->mnt_namespace;
+        struct mnt_namespace *n = parent->mnt_ns;
 
         BUG_ON(parent == mnt);
 
         list_add_tail(&head, &mnt->mnt_list);
         list_for_each_entry(m, &head, mnt_list)
-                m->mnt_namespace = n;
+                m->mnt_ns = n;
         list_splice(&head, n->list.prev);
 
         list_add_tail(&mnt->mnt_hash, mount_hashtable +
                                 hash(parent, mnt->mnt_mountpoint));
         list_add_tail(&mnt->mnt_child, &parent->mnt_mounts);
-        touch_namespace(n);
+        touch_mnt_namespace(n);
 }
 
 static struct vfsmount *next_mnt(struct vfsmount *p, struct vfsmount *root)
@@ -320,7 +320,7 @@ EXPORT_SYMBOL(mnt_unpin);
 /* iterator */
 static void *m_start(struct seq_file *m, loff_t *pos)
 {
-        struct namespace *n = m->private;
+        struct mnt_namespace *n = m->private;
         struct list_head *p;
         loff_t l = *pos;
 
@@ -333,7 +333,7 @@ static void *m_start(struct seq_file *m, loff_t *pos)
 
 static void *m_next(struct seq_file *m, void *v, loff_t *pos)
 {
-        struct namespace *n = m->private;
+        struct mnt_namespace *n = m->private;
         struct list_head *p = ((struct vfsmount *)v)->mnt_list.next;
         (*pos)++;
         return p == &n->list ? NULL : list_entry(p, struct vfsmount, mnt_list);
@@ -526,8 +526,8 @@ void umount_tree(struct vfsmount *mnt, int propagate, struct list_head *kill)
         list_for_each_entry(p, kill, mnt_hash) {
                 list_del_init(&p->mnt_expire);
                 list_del_init(&p->mnt_list);
-                __touch_namespace(p->mnt_namespace);
-                p->mnt_namespace = NULL;
+                __touch_mnt_namespace(p->mnt_ns);
+                p->mnt_ns = NULL;
                 list_del_init(&p->mnt_child);
                 if (p->mnt_parent != p)
                         p->mnt_mountpoint->d_mounted--;
@@ -830,7 +830,7 @@ static int attach_recursive_mnt(struct vfsmount *source_mnt,
         if (parent_nd) {
                 detach_mnt(source_mnt, parent_nd);
                 attach_mnt(source_mnt, nd);
-                touch_namespace(current->nsproxy->namespace);
+                touch_mnt_namespace(current->nsproxy->mnt_ns);
         } else {
                 mnt_set_mountpoint(dest_mnt, dest_dentry, source_mnt);
                 commit_tree(source_mnt);
@@ -1145,9 +1145,9 @@ static void expire_mount(struct vfsmount *mnt, struct list_head *mounts,
          */
         if (!propagate_mount_busy(mnt, 2)) {
                 /* delete from the namespace */
-                touch_namespace(mnt->mnt_namespace);
+                touch_mnt_namespace(mnt->mnt_ns);
                 list_del_init(&mnt->mnt_list);
-                mnt->mnt_namespace = NULL;
+                mnt->mnt_ns = NULL;
                 umount_tree(mnt, 1, umounts);
                 spin_unlock(&vfsmount_lock);
         } else {
@@ -1168,7 +1168,7 @@ static void expire_mount(struct vfsmount *mnt, struct list_head *mounts,
  */
 static void expire_mount_list(struct list_head *graveyard, struct list_head *mounts)
 {
-        struct namespace *namespace;
+        struct mnt_namespace *ns;
         struct vfsmount *mnt;
 
         while (!list_empty(graveyard)) {
@@ -1178,10 +1178,10 @@ static void expire_mount_list(struct list_head *graveyard, struct list_head *mou
 
                 /* don't do anything if the namespace is dead - all the
                  * vfsmounts from it are going away anyway */
-                namespace = mnt->mnt_namespace;
-                if (!namespace || !namespace->root)
+                ns = mnt->mnt_ns;
+                if (!ns || !ns->root)
                         continue;
-                get_namespace(namespace);
+                get_mnt_ns(ns);
 
                 spin_unlock(&vfsmount_lock);
                 down_write(&namespace_sem);
@@ -1189,7 +1189,7 @@ static void expire_mount_list(struct list_head *graveyard, struct list_head *mou
                 up_write(&namespace_sem);
                 release_mounts(&umounts);
                 mntput(mnt);
-                put_namespace(namespace);
+                put_mnt_ns(ns);
                 spin_lock(&vfsmount_lock);
         }
 }
@@ -1439,14 +1439,15 @@ dput_out:
  * Allocate a new namespace structure and populate it with contents
  * copied from the namespace of the passed in task structure.
  */
-struct namespace *dup_namespace(struct task_struct *tsk, struct fs_struct *fs)
+struct mnt_namespace *dup_mnt_ns(struct task_struct *tsk,
+                struct fs_struct *fs)
 {
-        struct namespace *namespace = tsk->nsproxy->namespace;
-        struct namespace *new_ns;
+        struct mnt_namespace *mnt_ns = tsk->nsproxy->mnt_ns;
+        struct mnt_namespace *new_ns;
         struct vfsmount *rootmnt = NULL, *pwdmnt = NULL, *altrootmnt = NULL;
         struct vfsmount *p, *q;
 
-        new_ns = kmalloc(sizeof(struct namespace), GFP_KERNEL);
+        new_ns = kmalloc(sizeof(struct mnt_namespace), GFP_KERNEL);
         if (!new_ns)
                 return NULL;
 
@@ -1457,7 +1458,7 @@ struct namespace *dup_namespace(struct task_struct *tsk, struct fs_struct *fs)
 
         down_write(&namespace_sem);
         /* First pass: copy the tree topology */
-        new_ns->root = copy_tree(namespace->root, namespace->root->mnt_root,
+        new_ns->root = copy_tree(mnt_ns->root, mnt_ns->root->mnt_root,
                                         CL_COPY_ALL | CL_EXPIRE);
         if (!new_ns->root) {
                 up_write(&namespace_sem);
@@ -1473,10 +1474,10 @@ struct namespace *dup_namespace(struct task_struct *tsk, struct fs_struct *fs)
          * as belonging to new namespace.  We have already acquired a private
          * fs_struct, so tsk->fs->lock is not needed.
          */
-        p = namespace->root;
+        p = mnt_ns->root;
         q = new_ns->root;
         while (p) {
-                q->mnt_namespace = new_ns;
+                q->mnt_ns = new_ns;
                 if (fs) {
                         if (p == fs->rootmnt) {
                                 rootmnt = p;
@@ -1491,7 +1492,7 @@ struct namespace *dup_namespace(struct task_struct *tsk, struct fs_struct *fs)
                                 fs->altrootmnt = mntget(q);
                         }
                 }
-                p = next_mnt(p, namespace->root);
+                p = next_mnt(p, mnt_ns->root);
                 q = next_mnt(q, new_ns->root);
         }
         up_write(&namespace_sem);
@@ -1506,16 +1507,16 @@ struct namespace *dup_namespace(struct task_struct *tsk, struct fs_struct *fs)
         return new_ns;
 }
 
-int copy_namespace(int flags, struct task_struct *tsk)
+int copy_mnt_ns(int flags, struct task_struct *tsk)
 {
-        struct namespace *namespace = tsk->nsproxy->namespace;
-        struct namespace *new_ns;
+        struct mnt_namespace *ns = tsk->nsproxy->mnt_ns;
+        struct mnt_namespace *new_ns;
         int err = 0;
 
-        if (!namespace)
+        if (!ns)
                 return 0;
 
-        get_namespace(namespace);
+        get_mnt_ns(ns);
 
         if (!(flags & CLONE_NEWNS))
                 return 0;
@@ -1525,16 +1526,16 @@ int copy_namespace(int flags, struct task_struct *tsk)
                 goto out;
         }
 
-        new_ns = dup_namespace(tsk, tsk->fs);
+        new_ns = dup_mnt_ns(tsk, tsk->fs);
         if (!new_ns) {
                 err = -ENOMEM;
                 goto out;
         }
 
-        tsk->nsproxy->namespace = new_ns;
+        tsk->nsproxy->mnt_ns = new_ns;
 
 out:
-        put_namespace(namespace);
+        put_mnt_ns(ns);
         return err;
 }
 
@@ -1754,7 +1755,7 @@ asmlinkage long sys_pivot_root(const char __user * new_root,
         detach_mnt(user_nd.mnt, &root_parent);
         attach_mnt(user_nd.mnt, &old_nd);     /* mount old root on put_old */
         attach_mnt(new_nd.mnt, &root_parent); /* mount new_root on / */
-        touch_namespace(current->nsproxy->namespace);
+        touch_mnt_namespace(current->nsproxy->mnt_ns);
         spin_unlock(&vfsmount_lock);
         chroot_fs_refs(&user_nd, &new_nd);
         security_sb_post_pivotroot(&user_nd, &new_nd);
@@ -1779,27 +1780,27 @@ out3:
 static void __init init_mount_tree(void)
 {
         struct vfsmount *mnt;
-        struct namespace *namespace;
+        struct mnt_namespace *ns;
 
         mnt = do_kern_mount("rootfs", 0, "rootfs", NULL);
         if (IS_ERR(mnt))
                 panic("Can't create rootfs");
-        namespace = kmalloc(sizeof(*namespace), GFP_KERNEL);
-        if (!namespace)
+        ns = kmalloc(sizeof(*ns), GFP_KERNEL);
+        if (!ns)
                 panic("Can't allocate initial namespace");
-        atomic_set(&namespace->count, 1);
-        INIT_LIST_HEAD(&namespace->list);
-        init_waitqueue_head(&namespace->poll);
-        namespace->event = 0;
-        list_add(&mnt->mnt_list, &namespace->list);
-        namespace->root = mnt;
-        mnt->mnt_namespace = namespace;
-
-        init_task.nsproxy->namespace = namespace;
-        get_namespace(namespace);
-
-        set_fs_pwd(current->fs, namespace->root, namespace->root->mnt_root);
-        set_fs_root(current->fs, namespace->root, namespace->root->mnt_root);
+        atomic_set(&ns->count, 1);
+        INIT_LIST_HEAD(&ns->list);
+        init_waitqueue_head(&ns->poll);
+        ns->event = 0;
+        list_add(&mnt->mnt_list, &ns->list);
+        ns->root = mnt;
+        mnt->mnt_ns = ns;
+
+        init_task.nsproxy->mnt_ns = ns;
+        get_mnt_ns(ns);
+
+        set_fs_pwd(current->fs, ns->root, ns->root->mnt_root);
+        set_fs_root(current->fs, ns->root, ns->root->mnt_root);
 }
 
 void __init mnt_init(unsigned long mempages)
@@ -1860,11 +1861,11 @@ void __init mnt_init(unsigned long mempages)
         init_mount_tree();
 }
 
-void __put_namespace(struct namespace *namespace)
+void __put_mnt_ns(struct mnt_namespace *ns)
 {
-        struct vfsmount *root = namespace->root;
+        struct vfsmount *root = ns->root;
         LIST_HEAD(umount_list);
-        namespace->root = NULL;
+        ns->root = NULL;
         spin_unlock(&vfsmount_lock);
         down_write(&namespace_sem);
         spin_lock(&vfsmount_lock);
@@ -1872,5 +1873,5 @@ void __put_namespace(struct namespace *namespace)
         spin_unlock(&vfsmount_lock);
         up_write(&namespace_sem);
         release_mounts(&umount_list);
-        kfree(namespace);
+        kfree(ns);
 }
diff --git a/fs/nfs/getroot.c b/fs/nfs/getroot.c
index 20c6f39ea38a..8391bd7a83ce 100644
--- a/fs/nfs/getroot.c
+++ b/fs/nfs/getroot.c
@@ -31,7 +31,7 @@
 #include <linux/nfs_idmap.h>
 #include <linux/vfs.h>
 #include <linux/namei.h>
-#include <linux/namespace.h>
+#include <linux/mnt_namespace.h>
 #include <linux/security.h>
 
 #include <asm/system.h>
diff --git a/fs/pnode.c b/fs/pnode.c
index da42ee61c1df..56aacead8362 100644
--- a/fs/pnode.c
+++ b/fs/pnode.c
@@ -6,7 +6,7 @@
  *      Author : Ram Pai (linuxram@us.ibm.com)
  *
  */
-#include <linux/namespace.h>
+#include <linux/mnt_namespace.h>
 #include <linux/mount.h>
 #include <linux/fs.h>
 #include "pnode.h"
diff --git a/fs/pnode.h b/fs/pnode.h
index 020e1bb60fdb..d45bd8ec36bf 100644
--- a/fs/pnode.h
+++ b/fs/pnode.h
@@ -13,7 +13,7 @@
 
 #define IS_MNT_SHARED(mnt) (mnt->mnt_flags & MNT_SHARED)
 #define IS_MNT_SLAVE(mnt) (mnt->mnt_master)
-#define IS_MNT_NEW(mnt)  (!mnt->mnt_namespace)
+#define IS_MNT_NEW(mnt)  (!mnt->mnt_ns)
 #define CLEAR_MNT_SHARED(mnt) (mnt->mnt_flags &= ~MNT_SHARED)
 #define IS_MNT_UNBINDABLE(mnt) (mnt->mnt_flags & MNT_UNBINDABLE)
 
diff --git a/fs/proc/base.c b/fs/proc/base.c
index a71f1755bb57..a3b5074118a7 100644
--- a/fs/proc/base.c
+++ b/fs/proc/base.c
@@ -59,7 +59,7 @@
 #include <linux/string.h>
 #include <linux/seq_file.h>
 #include <linux/namei.h>
-#include <linux/namespace.h>
+#include <linux/mnt_namespace.h>
 #include <linux/mm.h>
 #include <linux/smp_lock.h>
 #include <linux/rcupdate.h>
@@ -365,33 +365,33 @@ struct proc_mounts {
 static int mounts_open(struct inode *inode, struct file *file)
 {
         struct task_struct *task = get_proc_task(inode);
-        struct namespace *namespace = NULL;
+        struct mnt_namespace *ns = NULL;
         struct proc_mounts *p;
         int ret = -EINVAL;
 
         if (task) {
                 task_lock(task);
-                namespace = task->nsproxy->namespace;
-                if (namespace)
-                        get_namespace(namespace);
+                ns = task->nsproxy->mnt_ns;
+                if (ns)
+                        get_mnt_ns(ns);
                 task_unlock(task);
                 put_task_struct(task);
         }
 
-        if (namespace) {
+        if (ns) {
                 ret = -ENOMEM;
                 p = kmalloc(sizeof(struct proc_mounts), GFP_KERNEL);
                 if (p) {
                         file->private_data = &p->m;
                         ret = seq_open(file, &mounts_op);
                         if (!ret) {
-                                p->m.private = namespace;
-                                p->event = namespace->event;
+                                p->m.private = ns;
+                                p->event = ns->event;
                                 return 0;
                         }
                         kfree(p);
                 }
-                put_namespace(namespace);
+                put_mnt_ns(ns);
         }
         return ret;
 }
@@ -399,15 +399,15 @@ static int mounts_open(struct inode *inode, struct file *file)
 static int mounts_release(struct inode *inode, struct file *file)
 {
         struct seq_file *m = file->private_data;
-        struct namespace *namespace = m->private;
-        put_namespace(namespace);
+        struct mnt_namespace *ns = m->private;
+        put_mnt_ns(ns);
         return seq_release(inode, file);
 }
 
 static unsigned mounts_poll(struct file *file, poll_table *wait)
 {
         struct proc_mounts *p = file->private_data;
-        struct namespace *ns = p->m.private;
+        struct mnt_namespace *ns = p->m.private;
         unsigned res = 0;
 
         poll_wait(file, &ns->poll, wait);
@@ -437,21 +437,21 @@ static int mountstats_open(struct inode *inode, struct file *file)
 
         if (!ret) {
                 struct seq_file *m = file->private_data;
-                struct namespace *namespace = NULL;
+                struct mnt_namespace *mnt_ns = NULL;
                 struct task_struct *task = get_proc_task(inode);
 
                 if (task) {
                         task_lock(task);
                         if (task->nsproxy)
-                                namespace = task->nsproxy->namespace;
-                        if (namespace)
-                                get_namespace(namespace);
+                                mnt_ns = task->nsproxy->mnt_ns;
+                        if (mnt_ns)
+                                get_mnt_ns(mnt_ns);
                         task_unlock(task);
                         put_task_struct(task);
                 }
 
-                if (namespace)
-                        m->private = namespace;
+                if (mnt_ns)
+                        m->private = mnt_ns;
                 else {
                         seq_release(inode, file);
                         ret = -EINVAL;
diff --git a/fs/reiserfs/super.c b/fs/reiserfs/super.c
index 7fb5fb036f90..58ad4551a7c1 100644
--- a/fs/reiserfs/super.c
+++ b/fs/reiserfs/super.c
@@ -23,7 +23,7 @@
 #include <linux/blkdev.h>
 #include <linux/buffer_head.h>
 #include <linux/vfs.h>
-#include <linux/namespace.h>
+#include <linux/mnt_namespace.h>
 #include <linux/mount.h>
 #include <linux/namei.h>
 #include <linux/quotaops.h>
diff --git a/include/linux/init_task.h b/include/linux/init_task.h
index 848a68af3d42..5c4989172f7e 100644
--- a/include/linux/init_task.h
+++ b/include/linux/init_task.h
@@ -76,7 +76,7 @@ extern struct nsproxy init_nsproxy;
         .count          = ATOMIC_INIT(1),                               \
         .nslock         = __SPIN_LOCK_UNLOCKED(nsproxy.nslock),         \
         .uts_ns         = &init_uts_ns,                                 \
-        .namespace      = NULL,                                         \
+        .mnt_ns         = NULL,                                         \
         INIT_IPC_NS(ipc_ns)                                             \
 }
 
diff --git a/include/linux/mnt_namespace.h b/include/linux/mnt_namespace.h
new file mode 100644
index 000000000000..4af0b1fc282a
--- /dev/null
+++ b/include/linux/mnt_namespace.h
@@ -0,0 +1,42 @@
+#ifndef _NAMESPACE_H_
+#define _NAMESPACE_H_
+#ifdef __KERNEL__
+
+#include <linux/mount.h>
+#include <linux/sched.h>
+#include <linux/nsproxy.h>
+
+struct mnt_namespace {
+        atomic_t                count;
+        struct vfsmount *       root;
+        struct list_head        list;
+        wait_queue_head_t poll;
+        int event;
+};
+
+extern int copy_mnt_ns(int, struct task_struct *);
+extern void __put_mnt_ns(struct mnt_namespace *ns);
+extern struct mnt_namespace *dup_mnt_ns(struct task_struct *,
+                struct fs_struct *);
+
+static inline void put_mnt_ns(struct mnt_namespace *ns)
+{
+        if (atomic_dec_and_lock(&ns->count, &vfsmount_lock))
+                /* releases vfsmount_lock */
+                __put_mnt_ns(ns);
+}
+
+static inline void exit_mnt_ns(struct task_struct *p)
+{
+        struct mnt_namespace *ns = p->nsproxy->mnt_ns;
+        if (ns)
+                put_mnt_ns(ns);
+}
+
+static inline void get_mnt_ns(struct mnt_namespace *ns)
+{
+        atomic_inc(&ns->count);
+}
+
+#endif
+#endif
diff --git a/include/linux/mount.h b/include/linux/mount.h
index 403d1a97c512..e357dc86a4de 100644
--- a/include/linux/mount.h
+++ b/include/linux/mount.h
@@ -20,7 +20,7 @@
 struct super_block;
 struct vfsmount;
 struct dentry;
-struct namespace;
+struct mnt_namespace;
 
 #define MNT_NOSUID      0x01
 #define MNT_NODEV       0x02
@@ -52,7 +52,7 @@ struct vfsmount {
         struct list_head mnt_slave_list;/* list of slave mounts */
         struct list_head mnt_slave;     /* slave list entry */
         struct vfsmount *mnt_master;    /* slave is on master->mnt_slave_list */
-        struct namespace *mnt_namespace; /* containing namespace */
+        struct mnt_namespace *mnt_ns;   /* containing namespace */
         int mnt_pinned;
 };
 
diff --git a/include/linux/namespace.h b/include/linux/namespace.h
deleted file mode 100644
index d137009f0b2b..000000000000
--- a/include/linux/namespace.h
+++ /dev/null
@@ -1,42 +0,0 @@
-#ifndef _NAMESPACE_H_
-#define _NAMESPACE_H_
-#ifdef __KERNEL__
-
-#include <linux/mount.h>
-#include <linux/sched.h>
-#include <linux/nsproxy.h>
-
-struct namespace {
-        atomic_t                count;
-        struct vfsmount *       root;
-        struct list_head        list;
-        wait_queue_head_t poll;
-        int event;
-};
-
-extern int copy_namespace(int, struct task_struct *);
-extern void __put_namespace(struct namespace *namespace);
-extern struct namespace *dup_namespace(struct task_struct *, struct fs_struct *);
-
-static inline void put_namespace(struct namespace *namespace)
-{
-        if (atomic_dec_and_lock(&namespace->count, &vfsmount_lock))
-                /* releases vfsmount_lock */
-                __put_namespace(namespace);
-}
-
-static inline void exit_namespace(struct task_struct *p)
-{
-        struct namespace *namespace = p->nsproxy->namespace;
-        if (namespace) {
-                put_namespace(namespace);
-        }
-}
-
-static inline void get_namespace(struct namespace *namespace)
-{
-        atomic_inc(&namespace->count);
-}
-
-#endif
-#endif
diff --git a/include/linux/nsproxy.h b/include/linux/nsproxy.h
index 971d1c6dfc4b..0aba1b1a39c7 100644
--- a/include/linux/nsproxy.h
+++ b/include/linux/nsproxy.h
@@ -4,7 +4,7 @@
 #include <linux/spinlock.h>
 #include <linux/sched.h>
 
-struct namespace;
+struct mnt_namespace;
 struct uts_namespace;
 struct ipc_namespace;
 
@@ -25,7 +25,7 @@ struct nsproxy {
         spinlock_t nslock;
         struct uts_namespace *uts_ns;
         struct ipc_namespace *ipc_ns;
-        struct namespace *namespace;
+        struct mnt_namespace *mnt_ns;
 };
 extern struct nsproxy init_nsproxy;
 
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)