From: Enrico Scholz Date: Fri, 26 Dec 2003 00:16:48 +0000 (+0000) Subject: s!sys_vserver!vserver! X-Git-Tag: version_0_26_90~8 X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3893cf62842db1cfc792874d89baf641282760cf;p=util-vserver.git s!sys_vserver!vserver! git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/branches/SYSCALL_SWITCH@470 94cd875c-1c1d-0410-91d2-eb244daf1a30 --- diff --git a/util-vserver/lib/getversion-internal.hc b/util-vserver/lib/getversion-internal.hc index ac9f997..45456ed 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_vserver(VC_CMD(VERSION, 0, 0), cat, 0); + return 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 af68b86..ff16b17 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_vserver(VC_CMD(COMPAT, 1, 1), CTX_USER2KERNEL(ctx), &msg); + return 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_vserver(VC_CMD(COMPAT, 2, 3), nb, &msg); + return vserver(VC_CMD(COMPAT, 2, 3), nb, &msg); } static inline ALWAYSINLINE int diff --git a/util-vserver/lib/syscall_kill-v11.hc b/util-vserver/lib/syscall_kill-v11.hc index a96a3db..de1f42d 100644 --- a/util-vserver/lib/syscall_kill-v11.hc +++ b/util-vserver/lib/syscall_kill-v11.hc @@ -28,5 +28,5 @@ vc_ctx_kill_v11(ctx_t ctx, pid_t pid, int sig) .sig = sig }; - return sys_vserver(VC_CMD(PROCTRL, 1, 0), ctx, ¶m); + return vserver(VC_CMD(PROCTRL, 1, 0), ctx, ¶m); } diff --git a/util-vserver/lib/syscall_rlimit-v11.hc b/util-vserver/lib/syscall_rlimit-v11.hc index 95d19e0..9140b0e 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_vserver(VC_CMD(RLIMIT, 1, 0), CTX_USER2KERNEL(ctx), &vc_lim); + rc = 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_vserver(VC_CMD(RLIMIT, 2, 0), CTX_USER2KERNEL(ctx), &vc_lim); + return 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_vserver(VC_CMD(RLIMIT, 3, 0), CTX_USER2KERNEL(ctx), &vc_lim); + rc = 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; diff --git a/util-vserver/lib/vserver-internal.h b/util-vserver/lib/vserver-internal.h index 32cb55a..6215a51 100644 --- a/util-vserver/lib/vserver-internal.h +++ b/util-vserver/lib/vserver-internal.h @@ -26,8 +26,8 @@ #include #include -#ifndef __NR_sys_vserver -# define __NR_sys_vserver 273 +#ifndef __NR_vserver +# define __NR_vserver 273 #endif #define VC_PREFIX 0) @@ -90,13 +90,13 @@ extern "C" { #ifndef HAVE_SYS_VIRTUAL_CONTEXT #if defined(__pic__) && defined(__i386) inline static UNUSED ALWAYSINLINE -int sys_vserver(uint32_t cmd, uint32_t id, void *data) +int vserver(uint32_t cmd, uint32_t id, void *data) { - return syscall(__NR_sys_vserver, cmd, id, data); + return syscall(__NR_vserver, cmd, id, data); } #else inline static UNUSED ALWAYSINLINE -_syscall3(int, sys_vserver, +_syscall3(int, vserver, uint32_t, cmd, uint32_t, id, void *, data) #endif #endif