X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=include%2Flinux%2Fvserver%2Finode.h;h=c5d081d70210aad3dec256ffd196cd0ba386ca9c;hb=refs%2Fheads%2Fvserver;hp=b8a5e7885e39580c512f1239091e44e0cfff4f45;hpb=c7b5ebbddf7bcd3651947760f423e3783bbe6573;p=linux-2.6.git

diff --git a/include/linux/vserver/inode.h b/include/linux/vserver/inode.h
index b8a5e7885..c5d081d70 100644
--- a/include/linux/vserver/inode.h
+++ b/include/linux/vserver/inode.h
@@ -1,33 +1,8 @@
 #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
+#define IATTR_TAG	0x01000000
 
 #define IATTR_ADMIN	0x00000001
 #define IATTR_WATCH	0x00000002
@@ -38,6 +13,8 @@ struct	vcmd_ctx_iattr_v1 {
 #define IATTR_IUNLINK	0x00020000
 #define IATTR_IMMUTABLE 0x00040000
 
+#ifdef	__KERNEL__
+
 
 #ifdef	CONFIG_VSERVER_PROC_SECURE
 #define IATTR_PROC_DEFAULT	( IATTR_ADMIN | IATTR_HIDE )
@@ -47,16 +24,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 +33,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 */