X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=kernel%2Flimit_cmd.h;h=594e3bc2bc5a6c633e0ff2eb7d198b38da253804;hb=925e69ce006ee22fbc35b8328dcd4942d9215c96;hp=13a78928fbef4bdb112168b24bc047b3db62d313;hpb=0cbf992ea2fb9e247615e94c29b2083032a32152;p=util-vserver.git diff --git a/kernel/limit_cmd.h b/kernel/limit_cmd.h index 13a7892..594e3bc 100644 --- a/kernel/limit_cmd.h +++ b/kernel/limit_cmd.h @@ -7,6 +7,8 @@ #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) +#define VCMD_reset_hits VC_CMD(RLIMIT, 7, 0) +#define VCMD_reset_minmax VC_CMD(RLIMIT, 9, 0) struct vcmd_ctx_rlimit_v0 { uint32_t id; @@ -21,35 +23,18 @@ struct vcmd_ctx_rlimit_mask_v0 { uint32_t maximum; }; -#define CRLIM_UNSET (0ULL) -#define CRLIM_INFINITY (~0ULL) -#define CRLIM_KEEP (~1ULL) - -#ifdef __KERNEL__ +#define VCMD_rlimit_stat VC_CMD(VSTAT, 1, 0) -#ifdef CONFIG_IA32_EMULATION - -struct vcmd_ctx_rlimit_v0_x32 { +struct vcmd_rlimit_stat_v0 { uint32_t id; + uint32_t hits; + uint64_t value; uint64_t minimum; - uint64_t softlimit; uint64_t maximum; -} __attribute__ ((aligned (4))); - -#endif /* CONFIG_IA32_EMULATION */ - -#include - -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 *); - -#ifdef CONFIG_IA32_EMULATION - -extern int vc_get_rlimit_x32(uint32_t, void __user *); -extern int vc_set_rlimit_x32(uint32_t, void __user *); +}; -#endif /* CONFIG_IA32_EMULATION */ +#define CRLIM_UNSET (0ULL) +#define CRLIM_INFINITY (~0ULL) +#define CRLIM_KEEP (~1ULL) -#endif /* __KERNEL__ */ #endif /* _VX_LIMIT_CMD_H */