vserver 1.9.5.x5

[linux-2.6.git] / include / linux / vserver / namespace.h

diff --git a/include/linux/vserver/namespace.h b/include/linux/vserver/namespace.h
index 140fc79..8518a56 100644 (file)
--- a/include/linux/vserver/namespace.h
+++ b/include/linux/vserver/namespace.h
@@ -3,13 +3,13 @@
 
 #include <linux/types.h>
 
-       
+
 /* virtual host info names */
 
 #define VCMD_vx_set_vhi_name   VC_CMD(VHOST, 1, 0)
 #define VCMD_vx_get_vhi_name   VC_CMD(VHOST, 2, 0)
 
-struct  vcmd_vx_vhi_name_v0 {
+struct vcmd_vx_vhi_name_v0 {
        uint32_t field;
        char name[65];
 };
@@ -44,6 +44,7 @@ extern int vc_get_vhi_name(uint32_t, void __user *);
 struct vx_info;
 struct namespace;
 struct fs_struct;
+struct vfsmount;
 
 extern int vx_set_namespace(struct vx_info *, struct namespace *, struct fs_struct *);
 
@@ -52,4 +53,6 @@ extern int vc_cleanup_namespace(uint32_t, void __user *);
 extern int vc_set_namespace(uint32_t, void __user *);
 
 #endif /* __KERNEL__ */
+#else  /* _VX_NAMESPACE_H */
+#warning duplicate inclusion
 #endif /* _VX_NAMESPACE_H */