From: Kirill Korotaev <dev@sw.ru>

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>
---

 fs/cachefiles/cf-bind.c |    2 +-
 fs/cachefiles/cf-proc.c |    3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff -puN fs/cachefiles/cf-bind.c~rename-struct-namespace-to-struct-mnt_namespace-cachefiles fs/cachefiles/cf-bind.c
--- a/fs/cachefiles/cf-bind.c~rename-struct-namespace-to-struct-mnt_namespace-cachefiles
+++ a/fs/cachefiles/cf-bind.c
@@ -18,7 +18,7 @@
 #include <linux/file.h>
 #include <linux/namei.h>
 #include <linux/mount.h>
-#include <linux/namespace.h>
+#include <linux/mnt_namespace.h>
 #include <linux/statfs.h>
 #include <linux/proc_fs.h>
 #include <linux/ctype.h>
diff -puN fs/cachefiles/cf-proc.c~rename-struct-namespace-to-struct-mnt_namespace-cachefiles fs/cachefiles/cf-proc.c
--- a/fs/cachefiles/cf-proc.c~rename-struct-namespace-to-struct-mnt_namespace-cachefiles
+++ a/fs/cachefiles/cf-proc.c
@@ -18,7 +18,7 @@
 #include <linux/file.h>
 #include <linux/namei.h>
 #include <linux/mount.h>
-#include <linux/namespace.h>
+#include <linux/mnt_namespace.h>
 #include <linux/statfs.h>
 #include <linux/proc_fs.h>
 #include <linux/ctype.h>
@@ -70,7 +70,6 @@ static const struct cachefiles_proc_cmd 
 	{ "",		NULL			}
 };
 
-
 /*****************************************************************************/
 /*
  * do various checks
_