X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=include%2Flinux%2Fvserver%2Fnamespace.h;h=8518a56ccec9c7f707af87e5fb7c7e3887b3c8d4;hb=6a77f38946aaee1cd85eeec6cf4229b204c15071;hp=140fc79f220ffc0698909a9b32e83056142ac091;hpb=b76fcd5f0c655b6e3e9bf534594357025421c66a;p=linux-2.6.git diff --git a/include/linux/vserver/namespace.h b/include/linux/vserver/namespace.h index 140fc79f2..8518a56cc 100644 --- a/include/linux/vserver/namespace.h +++ b/include/linux/vserver/namespace.h @@ -3,13 +3,13 @@ #include - + /* 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 */