5 files changed, 47 insertions, 47 deletions

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;