This commit was generated by cvs2svn to compensate for changes in r2562,

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

diff --git a/kernel/dlimit_cmd.h b/kernel/dlimit_cmd.h
index b91a946..ed39987 100644 (file)
--- a/kernel/dlimit_cmd.h
+++ b/kernel/dlimit_cmd.h
@@ -1,6 +1,7 @@
 #ifndef _VX_DLIMIT_CMD_H
 #define _VX_DLIMIT_CMD_H
 
+
 /*  dlimit vserver commands */
 
 #define VCMD_add_dlimit                VC_CMD(DLIMIT, 1, 0)
@@ -10,32 +11,12 @@
 #define VCMD_get_dlimit                VC_CMD(DLIMIT, 6, 0)
 
 struct vcmd_ctx_dlimit_base_v0 {
-       const char __user *name;
+       const char *name;
        uint32_t flags;
 };
 
 struct vcmd_ctx_dlimit_v0 {
-       const char __user *name;
-       uint32_t space_used;                    /* used space in kbytes */
-       uint32_t space_total;                   /* maximum space in kbytes */
-       uint32_t inodes_used;                   /* used inodes */
-       uint32_t inodes_total;                  /* maximum inodes */
-       uint32_t reserved;                      /* reserved for root in % */
-       uint32_t flags;
-};
-
-
-#ifdef __KERNEL__
-
-#ifdef CONFIG_COMPAT
-
-struct vcmd_ctx_dlimit_base_v0_x32 {
-       compat_uptr_t name_ptr;
-       uint32_t flags;
-};
-
-struct vcmd_ctx_dlimit_v0_x32 {
-       compat_uptr_t name_ptr;
+       const char *name;
        uint32_t space_used;                    /* used space in kbytes */
        uint32_t space_total;                   /* maximum space in kbytes */
        uint32_t inodes_used;                   /* used inodes */
@@ -44,25 +25,8 @@ struct       vcmd_ctx_dlimit_v0_x32 {
        uint32_t flags;
 };
 
-#endif /* CONFIG_COMPAT */
-
-#include <linux/compiler.h>
-
-extern int vc_add_dlimit(uint32_t, void __user *);
-extern int vc_rem_dlimit(uint32_t, void __user *);
-
-extern int vc_set_dlimit(uint32_t, void __user *);
-extern int vc_get_dlimit(uint32_t, void __user *);
-
-#ifdef CONFIG_COMPAT
-
-extern int vc_add_dlimit_x32(uint32_t, void __user *);
-extern int vc_rem_dlimit_x32(uint32_t, void __user *);
-
-extern int vc_set_dlimit_x32(uint32_t, void __user *);
-extern int vc_get_dlimit_x32(uint32_t, void __user *);
-
-#endif /* CONFIG_COMPAT */
+#define CDLIM_UNSET            ((uint32_t)0UL)
+#define CDLIM_INFINITY         ((uint32_t)~0UL)
+#define CDLIM_KEEP             ((uint32_t)~1UL)
 
-#endif /* __KERNEL__ */
 #endif /* _VX_DLIMIT_CMD_H */