vserver 2.0-pre4

[linux-2.6.git] / include / linux / vserver / dlimit.h

diff --git a/include/linux/vserver/dlimit.h b/include/linux/vserver/dlimit.h
index 0c6587e..99c2240 100644 (file)
--- a/include/linux/vserver/dlimit.h
+++ b/include/linux/vserver/dlimit.h
@@ -2,31 +2,6 @@
 #define _VX_DLIMIT_H
 
 #include "switch.h"
-#include <linux/spinlock.h>
-
-/*  inode vserver commands */
-
-#define VCMD_add_dlimit                VC_CMD(DLIMIT, 1, 0)
-#define VCMD_rem_dlimit                VC_CMD(DLIMIT, 2, 0)
-
-#define VCMD_set_dlimit                VC_CMD(DLIMIT, 5, 0)
-#define VCMD_get_dlimit                VC_CMD(DLIMIT, 6, 0)
-
-
-struct vcmd_ctx_dlimit_base_v0 {
-       const char __user *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;
-};
 
 #define CDLIM_UNSET            (0ULL)
 #define CDLIM_INFINITY         (~0ULL)
@@ -35,6 +10,8 @@ struct        vcmd_ctx_dlimit_v0 {
 
 #ifdef __KERNEL__
 
+#include <linux/spinlock.h>
+
 struct super_block;
 
 struct dl_info {
@@ -46,7 +23,6 @@ struct dl_info {
 
        struct super_block *dl_sb;              /* associated superblock */
 
-//     struct rw_semaphore dl_sem;             /* protect the values */
        spinlock_t dl_lock;                     /* protect the values */
 
        uint64_t dl_space_used;                 /* used space in bytes */
@@ -69,14 +45,6 @@ struct kstatfs;
 
 extern void vx_vsi_statfs(struct super_block *, struct kstatfs *);
 
-
-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 *);
-
-
 typedef uint64_t dlsize_t;
 
 #endif /* __KERNEL__ */