X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Flib%2Fsyscall_rlimit-v11.hc;h=b42bb13da4d31edbd58385bb2384b857ae047a94;hb=96448e268dbe81573fd4afc6fccbdd63f0bc6580;hp=8148ba594b8fb77d7fa0f55d5a677b917c9a8ece;hpb=9bac3099d94faabc10f8916475bcfd38eb7acc49;p=util-vserver.git diff --git a/util-vserver/lib/syscall_rlimit-v11.hc b/util-vserver/lib/syscall_rlimit-v11.hc index 8148ba5..b42bb13 100644 --- a/util-vserver/lib/syscall_rlimit-v11.hc +++ b/util-vserver/lib/syscall_rlimit-v11.hc @@ -29,13 +29,13 @@ ((LIMIT)==VC_LIM_KEEP) ? CRLIM_KEEP : (LIMIT)) static inline ALWAYSINLINE int -vc_get_rlimit_v11(ctx_t ctx, int resource, struct vc_rlimit *lim) +vc_get_rlimit_v11(xid_t ctx, int resource, struct vc_rlimit *lim) { struct vcmd_ctx_rlimit_v0 vc_lim; int rc; vc_lim.id = resource; - rc = sys_virtual_context(VC_CMD(RLIMIT, 1, 0), CTX_USER2KERNEL(ctx), &vc_lim); + rc = vserver(VCMD_get_rlimit, CTX_USER2KERNEL(ctx), &vc_lim); lim->min = KERN2USR(vc_lim.minimum); lim->soft = KERN2USR(vc_lim.softlimit); lim->hard = KERN2USR(vc_lim.maximum); @@ -44,7 +44,7 @@ vc_get_rlimit_v11(ctx_t ctx, int resource, struct vc_rlimit *lim) } static inline ALWAYSINLINE int -vc_set_rlimit_v11(ctx_t ctx, int resource, struct vc_rlimit const *lim) +vc_set_rlimit_v11(xid_t ctx, int resource, struct vc_rlimit const *lim) { struct vcmd_ctx_rlimit_v0 vc_lim; @@ -53,16 +53,16 @@ vc_set_rlimit_v11(ctx_t ctx, int resource, struct vc_rlimit const *lim) vc_lim.softlimit = USR2KERN(lim->soft); vc_lim.maximum = USR2KERN(lim->hard); - return sys_virtual_context(VC_CMD(RLIMIT, 2, 0), CTX_USER2KERNEL(ctx), &vc_lim); + return vserver(VCMD_set_rlimit, CTX_USER2KERNEL(ctx), &vc_lim); } static inline ALWAYSINLINE int -vc_get_rlimit_mask_v11(ctx_t ctx, int UNUSED tmp, struct vc_rlimit_mask *lim) +vc_get_rlimit_mask_v11(xid_t ctx, int UNUSED tmp, struct vc_rlimit_mask *lim) { - struct vcmd_ctx_rlimit_v0 vc_lim; - int rc; + struct vcmd_ctx_rlimit_mask_v0 vc_lim; + int rc; - rc = sys_virtual_context(VC_CMD(RLIMIT, 3, 0), CTX_USER2KERNEL(ctx), &vc_lim); + rc = vserver(VCMD_get_rlimit_mask, CTX_USER2KERNEL(ctx), &vc_lim); lim->min = vc_lim.minimum; lim->soft = vc_lim.softlimit;