X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Flib%2Fsyscall_rlimit.c;h=c3f75a52c2ea15b0e32266ef09a76e6a550097ad;hb=38fe8b4a2dd28aebf52787c5b65cc79490fa53d3;hp=3a6444669f8ac55535b00ac8f3dc22d488984140;hpb=4c0037aecd96cf23da727c12381723ab5cbfa5e4;p=util-vserver.git diff --git a/util-vserver/lib/syscall_rlimit.c b/util-vserver/lib/syscall_rlimit.c index 3a64446..c3f75a5 100644 --- a/util-vserver/lib/syscall_rlimit.c +++ b/util-vserver/lib/syscall_rlimit.c @@ -22,32 +22,47 @@ #include "compat.h" #include "vserver.h" -#include "vserver-internal.h" #include "internal.h" #include "linuxvirtual.h" -#ifdef VC_ENABLE_API_V11 + +#include "vserver-internal.h" + +#if defined(VC_ENABLE_API_V11) || defined(VC_ENABLE_API_V13) # include "syscall_rlimit-v11.hc" #endif -#if defined (VC_ENABLE_API_V11) +#ifdef VC_ENABLE_API_V13 +# define vc_get_rlimit_v13 vc_get_rlimit_v11 +# define vc_set_rlimit_v13 vc_set_rlimit_v11 +# define vc_get_rlimit_mask_v13 vc_get_rlimit_mask_v11 +#endif + + +#if defined(VC_ENABLE_API_V11) || defined(VC_ENABLE_API_V13) + + // NOTICE: the reverse order of V11 -> V13 is correct here since these are + // the same syscalls int vc_get_rlimit(xid_t ctx, int resource, struct vc_rlimit *lim) { - CALL_VC(CALL_VC_V11(vc_get_rlimit, ctx, resource, lim)); + CALL_VC(CALL_VC_V11(vc_get_rlimit, ctx, resource, lim), + CALL_VC_V13(vc_get_rlimit, ctx, resource, lim)); } int vc_set_rlimit(xid_t ctx, int resource, struct vc_rlimit const *lim) { - CALL_VC(CALL_VC_V11(vc_set_rlimit, ctx, resource, lim)); + CALL_VC(CALL_VC_V11(vc_set_rlimit, ctx, resource, lim), + CALL_VC_V13(vc_set_rlimit, ctx, resource, lim)); } int vc_get_rlimit_mask(xid_t ctx, struct vc_rlimit_mask *lim) { - CALL_VC(CALL_VC_V11(vc_get_rlimit_mask, ctx, 0, lim)); + CALL_VC(CALL_VC_V11(vc_get_rlimit_mask, ctx, 0, lim), + CALL_VC_V13(vc_get_rlimit_mask, ctx, 0, lim)); }