X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=include%2Flinux%2Fvserver%2Flimit_def.h;h=6c99b2b1a2a330b527bf5b063c949168fe57e98b;hb=refs%2Fheads%2Fvserver;hp=b4a32c846a681127feebbb3a3fc14a9a28f320b6;hpb=76828883507a47dae78837ab5dec5a5b4513c667;p=linux-2.6.git

diff --git a/include/linux/vserver/limit_def.h b/include/linux/vserver/limit_def.h
index b4a32c846..6c99b2b1a 100644
--- a/include/linux/vserver/limit_def.h
+++ b/include/linux/vserver/limit_def.h
@@ -7,16 +7,41 @@
 #include "limit.h"
 
 
+struct _vx_res_limit {
+	rlim_t soft;		/* Context soft limit */
+	rlim_t hard;		/* Context hard limit */
+
+	rlim_atomic_t rcur;	/* Current value */
+	rlim_t rmin;		/* Context minimum */
+	rlim_t rmax;		/* Context maximum */
+
+	atomic_t lhit;		/* Limit hits */
+};
+
 /* context sub struct */
 
 struct _vx_limit {
-	atomic_t ticks;
-
-	unsigned long rlim[NUM_LIMITS];		/* Context limit */
-	unsigned long rmax[NUM_LIMITS];		/* Context maximum */
-	atomic_t rcur[NUM_LIMITS];		/* Current value */
-	atomic_t lhit[NUM_LIMITS];		/* Limit hits */
+	struct _vx_res_limit res[NUM_LIMITS];
 };
 
+#ifdef CONFIG_VSERVER_DEBUG
+
+static inline void __dump_vx_limit(struct _vx_limit *limit)
+{
+	int i;
+
+	printk("\t_vx_limit:");
+	for (i=0; i<NUM_LIMITS; i++) {
+		printk("\t [%2d] = %8lu %8lu/%8lu, %8ld/%8ld, %8d\n",
+			i, (unsigned long)__rlim_get(limit, i),
+			(unsigned long)__rlim_rmin(limit, i),
+			(unsigned long)__rlim_rmax(limit, i),
+			(long)__rlim_soft(limit, i),
+			(long)__rlim_hard(limit, i),
+			atomic_read(&__rlim_lhit(limit, i)));
+	}
+}
+
+#endif
 
 #endif	/* _VX_LIMIT_DEF_H */