X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fsyscall_rlimit.c;h=61b3070b561c8bf7bd7380d879f9be0c477f8916;hb=95e2774070e989fe9cf9f48dae5fa054e55e2a3e;hp=445878c1612f6cd1baedc0b2586e788f028655c0;hpb=06e1018272502e1d15d6d8f32b80fa96420785b8;p=util-vserver.git diff --git a/lib/syscall_rlimit.c b/lib/syscall_rlimit.c index 445878c..61b3070 100644 --- a/lib/syscall_rlimit.c +++ b/lib/syscall_rlimit.c @@ -1,4 +1,4 @@ -// $Id: syscall_rlimit.c,v 1.1.2.2 2003/12/30 13:45:56 ensc Exp $ --*- c++ -*-- +// $Id: syscall_rlimit.c 2207 2005-10-29 10:31:42Z ensc $ --*- c++ -*-- // Copyright (C) 2003 Enrico Scholz // @@ -22,31 +22,47 @@ #include "compat.h" #include "vserver.h" +#include "internal.h" +#include "virtual.h" + + #include "vserver-internal.h" -#include "linuxvirtual.h" -#ifdef VC_ENABLE_API_V11 +#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)); }