vserver 1.9.5.x5

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

diff --git a/include/linux/vserver/limit.h b/include/linux/vserver/limit.h
index 27496c1..449a4fc 100644 (file)
--- a/include/linux/vserver/limit.h
+++ b/include/linux/vserver/limit.h
@@ -1,117 +1,23 @@
-#if    defined(__KERNEL__) && defined(_VX_INFO_DEF_)
-
-#include <asm/atomic.h>
-#include <asm/resource.h>
-
-/* context sub struct */
-
-#define        RLIMIT_OPENFD   12
-
-#define NUM_RLIMITS    16
-
-#define VLIMIT_SOCK    16
-
-
-struct _vx_limit {
-       atomic_t ticks;
-
-       unsigned long rlim[NUM_RLIMITS];        /* Per context limit */
-       atomic_t res[NUM_RLIMITS];              /* Current value */
-};
-
-static inline void vx_info_init_limit(struct _vx_limit *limit)
-{
-       int lim;
-
-       for (lim=0; lim<NUM_RLIMITS; lim++) {
-               limit->rlim[lim] = RLIM_INFINITY;
-               atomic_set(&limit->res[lim], 0);
-       }
-}
-
-extern unsigned int vx_debug_limit;
-
-static inline void vx_info_exit_limit(struct _vx_limit *limit)
-{
-       int lim, value;
-
-       for (lim=0; lim<NUM_RLIMITS; lim++) {
-               value = atomic_read(&limit->res[lim]);
-               if (value && vx_debug_limit)
-                       printk("!!! limit: %p[%d] = %d on exit.\n",
-                               limit, lim, value);
-       }
-}
-
-
-static inline int vx_info_proc_limit(struct _vx_limit *limit, char *buffer)
-{
-       return sprintf(buffer,
-               "PROC:\t%8d/%ld\n"
-               "VM:\t%8d/%ld\n"
-               "VML:\t%8d/%ld\n"               
-               "RSS:\t%8d/%ld\n"
-               "FILES:\t%8d/%ld\n"
-               "OFD:\t%8d/%ld\n"
-               ,atomic_read(&limit->res[RLIMIT_NPROC])
-               ,limit->rlim[RLIMIT_NPROC]
-               ,atomic_read(&limit->res[RLIMIT_AS])
-               ,limit->rlim[RLIMIT_AS]
-               ,atomic_read(&limit->res[RLIMIT_MEMLOCK])
-               ,limit->rlim[RLIMIT_MEMLOCK]
-               ,atomic_read(&limit->res[RLIMIT_RSS])
-               ,limit->rlim[RLIMIT_RSS]
-               ,atomic_read(&limit->res[RLIMIT_NOFILE])
-               ,limit->rlim[RLIMIT_NOFILE]
-               ,atomic_read(&limit->res[RLIMIT_OPENFD])
-               ,limit->rlim[RLIMIT_OPENFD]
-               );
-}
-
-#else  /* _VX_INFO_DEF_ */
 #ifndef _VX_LIMIT_H
 #define _VX_LIMIT_H
 
-#include "switch.h"
-
-/*  rlimit vserver commands */
-
-#define VCMD_get_rlimit                VC_CMD(RLIMIT, 1, 0)
-#define VCMD_set_rlimit                VC_CMD(RLIMIT, 2, 0)
-#define VCMD_get_rlimit_mask   VC_CMD(RLIMIT, 3, 0)
-
-struct  vcmd_ctx_rlimit_v0 {
-       uint32_t id;
-       uint64_t minimum;
-       uint64_t softlimit;
-       uint64_t maximum;
-};
-
-struct  vcmd_ctx_rlimit_mask_v0 {
-       uint32_t minimum;
-       uint32_t softlimit;
-       uint32_t maximum;
-};
-
-#define CRLIM_UNSET            (0ULL)
-#define CRLIM_INFINITY         (~0ULL)
-#define CRLIM_KEEP             (~1ULL)
-
 #ifdef __KERNEL__
 
-#include <linux/compiler.h>
-
-extern int vc_get_rlimit(uint32_t, void __user *);
-extern int vc_set_rlimit(uint32_t, void __user *);
-extern int vc_get_rlimit_mask(uint32_t, void __user *);
-
 struct sysinfo;
 
 void vx_vsi_meminfo(struct sysinfo *);
 void vx_vsi_swapinfo(struct sysinfo *);
 
+#define VXD_RLIMIT(r,l)                (VXD_CBIT(limit, (l)) && ((r) == (l)))
 
-#endif /* __KERNEL__ */
+#define NUM_LIMITS     24
 
+#define VLIMIT_NSOCK   16
+#define VLIMIT_OPENFD  17
+#define VLIMIT_ANON    18
+#define VLIMIT_SHMEM   19
+
+extern const char *vlimit_name[NUM_LIMITS];
+
+#endif /* __KERNEL__ */
 #endif /* _VX_LIMIT_H */
-#endif