merge with 0.30.213

[util-vserver.git] / kernel / inode_cmd.h

diff --git a/kernel/inode_cmd.h b/kernel/inode_cmd.h
index f14c899..ed26aa1 100644 (file)
--- a/kernel/inode_cmd.h
+++ b/kernel/inode_cmd.h
@@ -1,6 +1,7 @@
 #ifndef _VX_INODE_CMD_H
 #define _VX_INODE_CMD_H
 
+
 /*  inode vserver commands */
 
 #define VCMD_get_iattr_v0      VC_CMD(INODE, 1, 0)
@@ -18,40 +19,11 @@ struct      vcmd_ctx_iattr_v0 {
 };
 
 struct vcmd_ctx_iattr_v1 {
-       const char __user *name;
+       const char *name;
        uint32_t xid;
        uint32_t flags;
        uint32_t mask;
 };
 
 
-#ifdef __KERNEL__
-
-#ifdef CONFIG_COMPAT
-
-struct vcmd_ctx_iattr_v1_x32 {
-       compat_uptr_t name_ptr;
-       uint32_t xid;
-       uint32_t flags;
-       uint32_t mask;
-};
-
-#endif /* CONFIG_COMPAT */
-
-#include <linux/compiler.h>
-
-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 *);
-
-#ifdef CONFIG_COMPAT
-
-extern int vc_get_iattr_x32(uint32_t, void __user *);
-extern int vc_set_iattr_x32(uint32_t, void __user *);
-
-#endif /* CONFIG_COMPAT */
-
-#endif /* __KERNEL__ */
 #endif /* _VX_INODE_CMD_H */