X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=sidebyside;f=include%2Flinux%2Fvserver%2Finode.h;h=89212c22343c9261e9ac02f4b981d19619707fad;hb=6a77f38946aaee1cd85eeec6cf4229b204c15071;hp=b8a5e7885e39580c512f1239091e44e0cfff4f45;hpb=87fc8d1bb10cd459024a742c6a10961fefcef18f;p=linux-2.6.git

diff --git a/include/linux/vserver/inode.h b/include/linux/vserver/inode.h
index b8a5e7885..89212c223 100644
--- a/include/linux/vserver/inode.h
+++ b/include/linux/vserver/inode.h
@@ -1,31 +1,6 @@
 #ifndef _VX_INODE_H
 #define _VX_INODE_H
 
-#include "switch.h"
-
-/*  inode vserver commands */
-
-#define VCMD_get_iattr_v0	VC_CMD(INODE, 1, 0)
-#define VCMD_set_iattr_v0	VC_CMD(INODE, 2, 0)
-
-#define VCMD_get_iattr		VC_CMD(INODE, 1, 1)
-#define VCMD_set_iattr		VC_CMD(INODE, 2, 1)
-
-struct	vcmd_ctx_iattr_v0 {
-	/* device handle in id */
-	uint64_t ino;
-	uint32_t xid;
-	uint32_t flags;
-	uint32_t mask;
-};
-
-struct	vcmd_ctx_iattr_v1 {
-	const char __user *name;
-	uint32_t xid;
-	uint32_t flags;
-	uint32_t mask;
-};
-
 
 #define IATTR_XID	0x01000000
 
@@ -38,6 +13,11 @@ struct	vcmd_ctx_iattr_v1 {
 #define IATTR_IUNLINK	0x00020000
 #define IATTR_IMMUTABLE 0x00040000
 
+#ifdef	__KERNEL__
+
+#ifndef	CONFIG_VSERVER
+#warning config options missing
+#endif
 
 #ifdef	CONFIG_VSERVER_PROC_SECURE
 #define IATTR_PROC_DEFAULT	( IATTR_ADMIN | IATTR_HIDE )
@@ -47,16 +27,8 @@ struct	vcmd_ctx_iattr_v1 {
 #define IATTR_PROC_SYMLINK	( IATTR_ADMIN )
 #endif
 
-#ifdef	__KERNEL__
-
 #define vx_hide_check(c,m)	(((m) & IATTR_HIDE) ? vx_check(c,m) : 1)
 
-extern int vc_get_iattr_v0(uint32_t, void __user *);
-extern int vc_set_iattr_v0(uint32_t, void __user *);
-
-extern int vc_get_iattr(uint32_t, void __user *);
-extern int vc_set_iattr(uint32_t, void __user *);
-
 #endif	/* __KERNEL__ */
 
 /* inode ioctls */
@@ -64,4 +36,6 @@ extern int vc_set_iattr(uint32_t, void __user *);
 #define FIOC_GETXFLG	_IOR('x', 5, long)
 #define FIOC_SETXFLG	_IOW('x', 6, long)
 
+#else	/* _VX_INODE_H */
+#warning duplicate inclusion
 #endif	/* _VX_INODE_H */