diff -NurpP --minimal linux-2.6.22.2-vs2.3.0.17.1/include/linux/vserver/inode_cmd.h linux-2.6.22.2-vs2.3.0.17.1.1/include/linux/vserver/inode_cmd.h --- linux-2.6.22.2-vs2.3.0.17.1/include/linux/vserver/inode_cmd.h 2007-08-05 20:53:13 +0200 +++ linux-2.6.22.2-vs2.3.0.17.1.1/include/linux/vserver/inode_cmd.h 2007-08-15 18:08:31 +0200 @@ -12,13 +12,13 @@ struct vcmd_ctx_iattr_v1 { const char __user *name; - uint32_t xid; + uint32_t tag; uint32_t flags; uint32_t mask; }; struct vcmd_ctx_fiattr_v0 { - uint32_t xid; + uint32_t tag; uint32_t flags; uint32_t mask; }; @@ -33,7 +33,7 @@ struct vcmd_ctx_fiattr_v0 { struct vcmd_ctx_iattr_v1_x32 { compat_uptr_t name_ptr; - uint32_t xid; + uint32_t tag; uint32_t flags; uint32_t mask; }; diff -NurpP --minimal linux-2.6.22.2-vs2.3.0.17.1/kernel/vserver/inode.c linux-2.6.22.2-vs2.3.0.17.1.1/kernel/vserver/inode.c --- linux-2.6.22.2-vs2.3.0.17.1/kernel/vserver/inode.c 2007-08-05 20:53:13 +0200 +++ linux-2.6.22.2-vs2.3.0.17.1.1/kernel/vserver/inode.c 2007-08-14 23:17:51 +0200 @@ -6,6 +6,7 @@ * Copyright (C) 2004-2007 Herbert Pötzl * * V0.01 separated from vcontext V0.05 + * V0.02 moved to tag (instead of xid) * */ @@ -74,7 +75,7 @@ static int __vc_get_iattr(struct inode * int vc_get_iattr(void __user *data) { struct nameidata nd; - struct vcmd_ctx_iattr_v1 vc_data = { .xid = -1 }; + struct vcmd_ctx_iattr_v1 vc_data = { .tag = -1 }; int ret; if (copy_from_user(&vc_data, data, sizeof(vc_data))) @@ -83,7 +84,7 @@ int vc_get_iattr(void __user *data) ret = user_path_walk_link(vc_data.name, &nd); if (!ret) { ret = __vc_get_iattr(nd.dentry->d_inode, - &vc_data.xid, &vc_data.flags, &vc_data.mask); + &vc_data.tag, &vc_data.flags, &vc_data.mask); path_release(&nd); } if (ret) @@ -99,7 +100,7 @@ int vc_get_iattr(void __user *data) int vc_get_iattr_x32(void __user *data) { struct nameidata nd; - struct vcmd_ctx_iattr_v1_x32 vc_data = { .xid = -1 }; + struct vcmd_ctx_iattr_v1_x32 vc_data = { .tag = -1 }; int ret; if (copy_from_user(&vc_data, data, sizeof(vc_data))) @@ -108,7 +109,7 @@ int vc_get_iattr_x32(void __user *data) ret = user_path_walk_link(compat_ptr(vc_data.name_ptr), &nd); if (!ret) { ret = __vc_get_iattr(nd.dentry->d_inode, - &vc_data.xid, &vc_data.flags, &vc_data.mask); + &vc_data.tag, &vc_data.flags, &vc_data.mask); path_release(&nd); } if (ret) @@ -125,7 +126,7 @@ int vc_get_iattr_x32(void __user *data) int vc_fget_iattr(uint32_t fd, void __user *data) { struct file *filp; - struct vcmd_ctx_fiattr_v0 vc_data = { .xid = -1 }; + struct vcmd_ctx_fiattr_v0 vc_data = { .tag = -1 }; int ret; if (copy_from_user(&vc_data, data, sizeof(vc_data))) @@ -136,7 +137,7 @@ int vc_fget_iattr(uint32_t fd, void __us return -EBADF; ret = __vc_get_iattr(filp->f_dentry->d_inode, - &vc_data.xid, &vc_data.flags, &vc_data.mask); + &vc_data.tag, &vc_data.flags, &vc_data.mask); fput(filp); @@ -236,7 +237,7 @@ int vc_set_iattr(void __user *data) ret = user_path_walk_link(vc_data.name, &nd); if (!ret) { ret = __vc_set_iattr(nd.dentry, - &vc_data.xid, &vc_data.flags, &vc_data.mask); + &vc_data.tag, &vc_data.flags, &vc_data.mask); path_release(&nd); } @@ -261,7 +262,7 @@ int vc_set_iattr_x32(void __user *data) ret = user_path_walk_link(compat_ptr(vc_data.name_ptr), &nd); if (!ret) { ret = __vc_set_iattr(nd.dentry, - &vc_data.xid, &vc_data.flags, &vc_data.mask); + &vc_data.tag, &vc_data.flags, &vc_data.mask); path_release(&nd); } @@ -287,7 +288,7 @@ int vc_fset_iattr(uint32_t fd, void __us if (!filp || !filp->f_dentry || !filp->f_dentry->d_inode) return -EBADF; - ret = __vc_set_iattr(filp->f_dentry, &vc_data.xid, + ret = __vc_set_iattr(filp->f_dentry, &vc_data.tag, &vc_data.flags, &vc_data.mask); fput(filp);