fedora core 6 1.2949 + vserver 2.2.0

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

diff --git a/include/linux/vserver/dlimit.h b/include/linux/vserver/dlimit.h
index 99c2240..583aa22 100644 (file)
--- a/include/linux/vserver/dlimit.h
+++ b/include/linux/vserver/dlimit.h
@@ -3,13 +3,13 @@
 
 #include "switch.h"
 
-#define CDLIM_UNSET            (0ULL)
-#define CDLIM_INFINITY         (~0ULL)
-#define CDLIM_KEEP             (~1ULL)
-
 
 #ifdef __KERNEL__
 
+/*      keep in sync with CDLIM_INFINITY       */
+
+#define DLIM_INFINITY          (~0ULL)
+
 #include <linux/spinlock.h>
 
 struct super_block;
@@ -17,7 +17,7 @@ struct super_block;
 struct dl_info {
        struct hlist_node dl_hlist;             /* linked list of contexts */
        struct rcu_head dl_rcu;                 /* the rcu head */
-       xid_t dl_xid;                           /* context id */
+       tag_t dl_tag;                           /* context tag */
        atomic_t dl_usecnt;                     /* usage count */
        atomic_t dl_refcnt;                     /* reference count */
 
@@ -25,10 +25,10 @@ struct dl_info {
 
        spinlock_t dl_lock;                     /* protect the values */
 
-       uint64_t dl_space_used;                 /* used space in bytes */
-       uint64_t dl_space_total;                /* maximum space in bytes */
-       uint32_t dl_inodes_used;                /* used inodes */
-       uint32_t dl_inodes_total;               /* maximum inodes */
+       unsigned long long dl_space_used;       /* used space in bytes */
+       unsigned long long dl_space_total;      /* maximum space in bytes */
+       unsigned long dl_inodes_used;           /* used inodes */
+       unsigned long dl_inodes_total;          /* maximum inodes */
 
        unsigned int dl_nrlmult;                /* non root limit mult */
 };
@@ -38,7 +38,7 @@ struct rcu_head;
 extern void rcu_free_dl_info(struct rcu_head *);
 extern void unhash_dl_info(struct dl_info *);
 
-extern struct dl_info *locate_dl_info(struct super_block *, xid_t);
+extern struct dl_info *locate_dl_info(struct super_block *, tag_t);
 
 
 struct kstatfs;