From af3ca7cc9635e054981138cb1532bf3450475e1b Mon Sep 17 00:00:00 2001 From: Enrico Scholz Date: Fri, 28 Nov 2003 23:17:56 +0000 Subject: [PATCH] s!sys_virtual_context!sys_vserver! git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/branches/SYSCALL_SWITCH@453 94cd875c-1c1d-0410-91d2-eb244daf1a30 --- util-vserver/lib/getversion-internal.hc | 2 +- util-vserver/lib/syscall-compat.hc | 4 ++-- util-vserver/lib/syscall_rlimit-v11.hc | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/util-vserver/lib/getversion-internal.hc b/util-vserver/lib/getversion-internal.hc index a4a14d0..ac9f997 100644 --- a/util-vserver/lib/getversion-internal.hc +++ b/util-vserver/lib/getversion-internal.hc @@ -30,7 +30,7 @@ static inline ALWAYSINLINE int vc_get_version_internal(int cat) { - return sys_virtual_context(VC_CMD(VERSION, 0, 0), cat, 0); + return sys_vserver(VC_CMD(VERSION, 0, 0), cat, 0); } #endif // H_UTIL_VSERVER_LIB_GETVERSION_INTERNAL_H diff --git a/util-vserver/lib/syscall-compat.hc b/util-vserver/lib/syscall-compat.hc index a3cdcba..af68b86 100644 --- a/util-vserver/lib/syscall-compat.hc +++ b/util-vserver/lib/syscall-compat.hc @@ -35,7 +35,7 @@ vc_new_s_context_compat(ctx_t ctx, unsigned int remove_cap, unsigned int flags) msg.remove_cap = remove_cap; msg.flags = flags; - return sys_virtual_context(VC_CMD(COMPAT, 1, 1), CTX_USER2KERNEL(ctx), &msg); + return sys_vserver(VC_CMD(COMPAT, 1, 1), CTX_USER2KERNEL(ctx), &msg); } static inline ALWAYSINLINE int @@ -56,7 +56,7 @@ vc_set_ipv4root_compat(uint32_t bcast, size_t nb, struct vc_ip_mask_pair const msg.ip_mask_pair[i].mask = ips[i].mask; } - return sys_virtual_context(VC_CMD(COMPAT, 2, 3), nb, &msg); + return sys_vserver(VC_CMD(COMPAT, 2, 3), nb, &msg); } static inline ALWAYSINLINE int diff --git a/util-vserver/lib/syscall_rlimit-v11.hc b/util-vserver/lib/syscall_rlimit-v11.hc index 1755db0..95d19e0 100644 --- a/util-vserver/lib/syscall_rlimit-v11.hc +++ b/util-vserver/lib/syscall_rlimit-v11.hc @@ -35,7 +35,7 @@ vc_get_rlimit_v11(ctx_t ctx, int resource, struct vc_rlimit *lim) int rc; vc_lim.id = resource; - rc = sys_virtual_context(VC_CMD(RLIMIT, 1, 0), CTX_USER2KERNEL(ctx), &vc_lim); + rc = sys_vserver(VC_CMD(RLIMIT, 1, 0), CTX_USER2KERNEL(ctx), &vc_lim); lim->min = KERN2USR(vc_lim.minimum); lim->soft = KERN2USR(vc_lim.softlimit); lim->hard = KERN2USR(vc_lim.maximum); @@ -53,7 +53,7 @@ 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 sys_vserver(VC_CMD(RLIMIT, 2, 0), CTX_USER2KERNEL(ctx), &vc_lim); } static inline ALWAYSINLINE int @@ -64,7 +64,7 @@ vc_get_rlimit_mask_v11(ctx_t ctx, int tmp, struct vc_rlimit_mask *lim) (void)tmp; - rc = sys_virtual_context(VC_CMD(RLIMIT, 3, 0), CTX_USER2KERNEL(ctx), &vc_lim); + rc = sys_vserver(VC_CMD(RLIMIT, 3, 0), CTX_USER2KERNEL(ctx), &vc_lim); lim->min = vc_lim.minimum; lim->soft = vc_lim.softlimit; lim->hard = vc_lim.maximum; -- 1.8.1.5