From ebf251c8ca0a527c15e9873a220dd5053362a679 Mon Sep 17 00:00:00 2001 From: Enrico Scholz Date: Mon, 2 Feb 2004 18:55:52 +0000 Subject: [PATCH] use CTX_USER2KERNEL to wrap xid git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/trunk@736 94cd875c-1c1d-0410-91d2-eb244daf1a30 --- util-vserver/lib/fscompat_getiattr-v13.hc | 2 +- util-vserver/lib/fscompat_setiattr-v13.hc | 2 +- util-vserver/lib/syscall_getiattr-v13.hc | 2 +- util-vserver/lib/syscall_getvxinfo-v13.hc | 4 +++- util-vserver/lib/syscall_kill-v11.hc | 2 +- util-vserver/lib/syscall_setiattr-v13.hc | 2 +- 6 files changed, 8 insertions(+), 6 deletions(-) diff --git a/util-vserver/lib/fscompat_getiattr-v13.hc b/util-vserver/lib/fscompat_getiattr-v13.hc index 613303a..9a59569 100644 --- a/util-vserver/lib/fscompat_getiattr-v13.hc +++ b/util-vserver/lib/fscompat_getiattr-v13.hc @@ -24,5 +24,5 @@ inline static ALWAYSINLINE int vc_get_iattr_compat_v13(char const UNUSED *filename, dev_t dev, ino_t ino, xid_t *xid, uint32_t *flags, uint32_t *mask) { - return vc_get_iattr(dev, ino, xid, flags, mask); + return vc_get_iattr(dev, ino, CTX_USER2KERNEL(xid), flags, mask); } diff --git a/util-vserver/lib/fscompat_setiattr-v13.hc b/util-vserver/lib/fscompat_setiattr-v13.hc index 93fed93..1cc6700 100644 --- a/util-vserver/lib/fscompat_setiattr-v13.hc +++ b/util-vserver/lib/fscompat_setiattr-v13.hc @@ -25,5 +25,5 @@ vc_set_iattr_compat_v13(char const UNUSED *filename, dev_t dev, ino_t ino, xid_t xid, uint32_t flags, uint32_t mask) { - return vc_set_iattr(dev, ino, xid, flags, mask); + return vc_set_iattr(dev, ino, CTX_USER2KERNEL(xid), flags, mask); } diff --git a/util-vserver/lib/syscall_getiattr-v13.hc b/util-vserver/lib/syscall_getiattr-v13.hc index 4e792be..490804e 100644 --- a/util-vserver/lib/syscall_getiattr-v13.hc +++ b/util-vserver/lib/syscall_getiattr-v13.hc @@ -32,7 +32,7 @@ vc_get_iattr_v13(dev_t dev, ino_t ino, attr.ino = ino; rc = vserver(VCMD_get_iattr, dev, &attr); - if (xid) *xid = attr.xid; + if (xid) *xid = CTX_KERNEL2USER(attr.xid); if (flags) *flags = attr.flags; if (mask) *mask = attr.mask; diff --git a/util-vserver/lib/syscall_getvxinfo-v13.hc b/util-vserver/lib/syscall_getvxinfo-v13.hc index 11bafa6..da6b78a 100644 --- a/util-vserver/lib/syscall_getvxinfo-v13.hc +++ b/util-vserver/lib/syscall_getvxinfo-v13.hc @@ -24,7 +24,9 @@ static inline ALWAYSINLINE int vc_get_vx_info_v13(xid_t xid, struct vc_vx_info *info) { struct vcmd_vx_info_v0 res; - int rc = vserver(VCMD_vx_info, xid, &res); + int rc; + + rc = vserver(VCMD_vx_info, CTX_USER2KERNEL(xid), &res); if (rc==-1) return -1; info->xid = CTX_KERNEL2USER(res.xid); diff --git a/util-vserver/lib/syscall_kill-v11.hc b/util-vserver/lib/syscall_kill-v11.hc index 85d751a..10e1d3c 100644 --- a/util-vserver/lib/syscall_kill-v11.hc +++ b/util-vserver/lib/syscall_kill-v11.hc @@ -27,5 +27,5 @@ vc_ctx_kill_v11(xid_t ctx, pid_t pid, int sig) param.pid = pid; param.sig = sig; - return vserver(VCMD_ctx_kill, ctx, ¶m); + return vserver(VCMD_ctx_kill, CTX_USER2KERNEL(ctx), ¶m); } diff --git a/util-vserver/lib/syscall_setiattr-v13.hc b/util-vserver/lib/syscall_setiattr-v13.hc index bae766e..6a97412 100644 --- a/util-vserver/lib/syscall_setiattr-v13.hc +++ b/util-vserver/lib/syscall_setiattr-v13.hc @@ -28,7 +28,7 @@ vc_set_iattr_v13(dev_t dev, ino_t ino, xid_t xid, uint32_t flags, uint32_t mask struct vcmd_ctx_iattr_v0 attr; attr.ino = ino; - attr.xid = xid; + attr.xid = CTX_USER2KERNEL(xid); attr.flags = flags; attr.mask = mask; return vserver(VCMD_set_iattr, dev, &attr); -- 1.8.1.5