diff -NurpP --minimal linux-2.6.16-rc5-vs2.0.2-rc10.2/include/linux/vserver/context.h linux-2.6.16-rc5-vs2.0.2-rc10.x/include/linux/vserver/context.h --- linux-2.6.16-rc5-vs2.0.2-rc10.2/include/linux/vserver/context.h 2006-02-17 22:18:51 +0100 +++ linux-2.6.16-rc5-vs2.0.2-rc10.x/include/linux/vserver/context.h 2006-03-10 22:47:50 +0100 @@ -145,8 +153,8 @@ struct vx_info { extern void claim_vx_info(struct vx_info *, struct task_struct *); extern void release_vx_info(struct vx_info *, struct task_struct *); -extern struct vx_info *locate_vx_info(int); -extern struct vx_info *locate_or_create_vx_info(int); +extern struct vx_info *lookup_vx_info(int); +extern struct vx_info *lookup_or_create_vx_info(int); extern int get_xid_list(int, unsigned int *, int); extern int xid_is_hashed(xid_t); diff -NurpP --minimal linux-2.6.16-rc5-vs2.0.2-rc10.2/ipc/mqueue.c linux-2.6.16-rc5-vs2.0.2-rc10.x/ipc/mqueue.c --- linux-2.6.16-rc5-vs2.0.2-rc10.2/ipc/mqueue.c 2006-02-17 22:18:51 +0100 +++ linux-2.6.16-rc5-vs2.0.2-rc10.x/ipc/mqueue.c 2006-03-10 22:11:58 +0100 @@ -261,7 +261,7 @@ static void mqueue_delete_inode(struct i (info->attr.mq_maxmsg * info->attr.mq_msgsize)); user = info->user; if (user) { - struct vx_info *vxi = locate_vx_info(user->xid); + struct vx_info *vxi = lookup_vx_info(user->xid); spin_lock(&mq_lock); user->mq_bytes -= mq_bytes; diff -NurpP --minimal linux-2.6.16-rc5-vs2.0.2-rc10.2/ipc/shm.c linux-2.6.16-rc5-vs2.0.2-rc10.x/ipc/shm.c --- linux-2.6.16-rc5-vs2.0.2-rc10.2/ipc/shm.c 2006-02-17 22:18:51 +0100 +++ linux-2.6.16-rc5-vs2.0.2-rc10.x/ipc/shm.c 2006-03-10 22:11:58 +0100 @@ -116,7 +116,7 @@ static void shm_open (struct vm_area_str */ static void shm_destroy (struct shmid_kernel *shp) { - struct vx_info *vxi = locate_vx_info(shp->shm_perm.xid); + struct vx_info *vxi = lookup_vx_info(shp->shm_perm.xid); int numpages = (shp->shm_segsz + PAGE_SIZE - 1) >> PAGE_SHIFT; vx_ipcshm_sub(vxi, shp, numpages); diff -NurpP --minimal linux-2.6.16-rc5-vs2.0.2-rc10.2/include/linux/vserver/network.h linux-2.6.16-rc5-vs2.0.2-rc10.x/include/linux/vserver/network.h --- linux-2.6.16-rc5-vs2.0.2-rc10.2/include/linux/vserver/network.h 2006-02-17 22:18:51 +0100 +++ linux-2.6.16-rc5-vs2.0.2-rc10.x/include/linux/vserver/network.h 2006-03-10 23:02:57 +0100 @@ -70,8 +71,7 @@ struct nx_info { #define NXS_SHUTDOWN 0x0100 #define NXS_RELEASED 0x8000 -extern struct nx_info *locate_nx_info(int); -extern struct nx_info *locate_or_create_nx_info(int); +extern struct nx_info *lookup_nx_info(int); extern int get_nid_list(int, unsigned int *, int); extern int nid_is_hashed(nid_t); diff -NurpP --minimal linux-2.6.16-rc5-vs2.0.2-rc10.2/kernel/vserver/context.c linux-2.6.16-rc5-vs2.0.2-rc10.x/kernel/vserver/context.c --- linux-2.6.16-rc5-vs2.0.2-rc10.2/kernel/vserver/context.c 2006-02-17 22:18:51 +0100 +++ linux-2.6.16-rc5-vs2.0.2-rc10.x/kernel/vserver/context.c 2006-03-10 23:28:19 +0100 @@ -389,12 +394,12 @@ void unhash_vx_info(struct vx_info *vxi) } -/* locate_vx_info() +/* lookup_vx_info() * search for a vx_info and get() it * negative id means current */ -struct vx_info *locate_vx_info(int id) +struct vx_info *lookup_vx_info(int id) { struct vx_info *vxi = NULL; @@ -424,7 +429,7 @@ int xid_is_hashed(xid_t xid) #ifdef CONFIG_VSERVER_LEGACY -struct vx_info *locate_or_create_vx_info(int id) +struct vx_info *lookup_or_create_vx_info(int id) { int err; @@ -633,7 +698,7 @@ int vc_vx_info(uint32_t id, void __user if (!capable(CAP_SYS_ADMIN) || !capable(CAP_SYS_RESOURCE)) return -EPERM; - vxi = locate_vx_info(id); + vxi = lookup_vx_info(id); if (!vxi) return -ESRCH; @@ -694,7 +766,7 @@ int vc_ctx_migrate(uint32_t id, void __u return 0; } - vxi = locate_vx_info(id); + vxi = lookup_vx_info(id); if (!vxi) return -ESRCH; vx_migrate_task(current, vxi); @@ -711,7 +787,7 @@ int vc_get_cflags(uint32_t id, void __us if (!capable(CAP_SYS_ADMIN)) return -EPERM; - vxi = locate_vx_info(id); + vxi = lookup_vx_info(id); if (!vxi) return -ESRCH; @@ -738,7 +814,7 @@ int vc_set_cflags(uint32_t id, void __us if (copy_from_user (&vc_data, data, sizeof(vc_data))) return -EFAULT; - vxi = locate_vx_info(id); + vxi = lookup_vx_info(id); if (!vxi) return -ESRCH; @@ -766,7 +848,7 @@ int vc_get_ccaps(uint32_t id, void __use if (!capable(CAP_SYS_ADMIN)) return -EPERM; - vxi = locate_vx_info(id); + vxi = lookup_vx_info(id); if (!vxi) return -ESRCH; @@ -790,7 +872,7 @@ int vc_set_ccaps(uint32_t id, void __use if (copy_from_user (&vc_data, data, sizeof(vc_data))) return -EFAULT; - vxi = locate_vx_info(id); + vxi = lookup_vx_info(id); if (!vxi) return -ESRCH; diff -NurpP --minimal linux-2.6.16-rc5-vs2.0.2-rc10.2/kernel/vserver/cvirt.c linux-2.6.16-rc5-vs2.0.2-rc10.x/kernel/vserver/cvirt.c --- linux-2.6.16-rc5-vs2.0.2-rc10.2/kernel/vserver/cvirt.c 2006-02-17 22:18:51 +0100 +++ linux-2.6.16-rc5-vs2.0.2-rc10.x/kernel/vserver/cvirt.c 2006-03-10 22:11:58 +0100 @@ -222,7 +222,7 @@ int vc_set_vhi_name(uint32_t id, void __ if (copy_from_user (&vc_data, data, sizeof(vc_data))) return -EFAULT; - vxi = locate_vx_info(id); + vxi = lookup_vx_info(id); if (!vxi) return -ESRCH; @@ -242,7 +242,7 @@ int vc_get_vhi_name(uint32_t id, void __ if (copy_from_user (&vc_data, data, sizeof(vc_data))) return -EFAULT; - vxi = locate_vx_info(id); + vxi = lookup_vx_info(id); if (!vxi) return -ESRCH; diff -NurpP --minimal linux-2.6.16-rc5-vs2.0.2-rc10.2/kernel/vserver/legacy.c linux-2.6.16-rc5-vs2.0.2-rc10.x/kernel/vserver/legacy.c --- linux-2.6.16-rc5-vs2.0.2-rc10.2/kernel/vserver/legacy.c 2006-02-17 22:18:51 +0100 +++ linux-2.6.16-rc5-vs2.0.2-rc10.x/kernel/vserver/legacy.c 2006-03-10 22:11:58 +0100 @@ -73,9 +76,9 @@ int vc_new_s_context(uint32_t ctx, void return -EINVAL; if ((ctx == VX_DYNAMIC_ID) || (ctx < MIN_D_CONTEXT)) - new_vxi = locate_or_create_vx_info(ctx); + new_vxi = lookup_or_create_vx_info(ctx); else - new_vxi = locate_vx_info(ctx); + new_vxi = lookup_vx_info(ctx); if (!new_vxi) return -EINVAL; diff -NurpP --minimal linux-2.6.16-rc5-vs2.0.2-rc10.2/kernel/vserver/limit.c linux-2.6.16-rc5-vs2.0.2-rc10.x/kernel/vserver/limit.c --- linux-2.6.16-rc5-vs2.0.2-rc10.2/kernel/vserver/limit.c 2006-02-17 22:18:51 +0100 +++ linux-2.6.16-rc5-vs2.0.2-rc10.x/kernel/vserver/limit.c 2006-03-10 22:59:20 +0100 @@ -81,7 +81,7 @@ int vc_get_rlimit(uint32_t id, void __us if (!is_valid_rlimit(vc_data.id)) return -ENOTSUPP; - vxi = locate_vx_info(id); + vxi = lookup_vx_info(id); if (!vxi) return -ESRCH; @@ -107,7 +107,7 @@ int vc_set_rlimit(uint32_t id, void __us if (!is_valid_rlimit(vc_data.id)) return -ENOTSUPP; - vxi = locate_vx_info(id); + vxi = lookup_vx_info(id); if (!vxi) return -ESRCH; diff -NurpP --minimal linux-2.6.16-rc5-vs2.0.2-rc10.2/kernel/vserver/namespace.c linux-2.6.16-rc5-vs2.0.2-rc10.x/kernel/vserver/namespace.c --- linux-2.6.16-rc5-vs2.0.2-rc10.2/kernel/vserver/namespace.c 2006-02-17 22:18:51 +0100 +++ linux-2.6.16-rc5-vs2.0.2-rc10.x/kernel/vserver/namespace.c 2006-03-10 22:11:58 +0100 @@ -56,7 +56,7 @@ int vc_enter_namespace(uint32_t id, void if (!vx_check(0, VX_ADMIN)) return -ENOSYS; - vxi = locate_vx_info(id); + vxi = lookup_vx_info(id); if (!vxi) return -ESRCH; diff -NurpP --minimal linux-2.6.16-rc5-vs2.0.2-rc10.2/kernel/vserver/network.c linux-2.6.16-rc5-vs2.0.2-rc10.x/kernel/vserver/network.c --- linux-2.6.16-rc5-vs2.0.2-rc10.2/kernel/vserver/network.c 2006-02-18 19:45:38 +0100 +++ linux-2.6.16-rc5-vs2.0.2-rc10.x/kernel/vserver/network.c 2006-03-10 22:11:58 +0100 @@ -282,12 +282,12 @@ struct nx_info *create_nx_info(void) #endif -/* locate_nx_info() +/* lookup_nx_info() * search for a nx_info and get() it * negative id means current */ -struct nx_info *locate_nx_info(int id) +struct nx_info *lookup_nx_info(int id) { struct nx_info *nxi = NULL; @@ -525,7 +536,7 @@ int vc_nx_info(uint32_t id, void __user if (!capable(CAP_SYS_ADMIN) || !capable(CAP_SYS_RESOURCE)) return -EPERM; - nxi = locate_nx_info(id); + nxi = lookup_nx_info(id); if (!nxi) return -ESRCH; @@ -579,7 +594,7 @@ int vc_net_migrate(uint32_t id, void __u if (!capable(CAP_SYS_ADMIN)) return -EPERM; - nxi = locate_nx_info(id); + nxi = lookup_nx_info(id); if (!nxi) return -ESRCH; nx_migrate_task(current, nxi); @@ -608,7 +623,7 @@ int vc_net_add(uint32_t nid, void __user break; } - nxi = locate_nx_info(nid); + nxi = lookup_nx_info(nid); if (!nxi) return -ESRCH; @@ -650,7 +665,7 @@ int vc_net_remove(uint32_t nid, void __u if (data && copy_from_user (&vc_data, data, sizeof(vc_data))) return -EFAULT; - nxi = locate_nx_info(nid); + nxi = lookup_nx_info(nid); if (!nxi) return -ESRCH; @@ -676,7 +691,7 @@ int vc_get_nflags(uint32_t id, void __us if (!capable(CAP_SYS_ADMIN)) return -EPERM; - nxi = locate_nx_info(id); + nxi = lookup_nx_info(id); if (!nxi) return -ESRCH; @@ -703,7 +718,7 @@ int vc_set_nflags(uint32_t id, void __us if (copy_from_user (&vc_data, data, sizeof(vc_data))) return -EFAULT; - nxi = locate_nx_info(id); + nxi = lookup_nx_info(id); if (!nxi) return -ESRCH; @@ -725,7 +743,7 @@ int vc_get_ncaps(uint32_t id, void __use if (!capable(CAP_SYS_ADMIN)) return -EPERM; - nxi = locate_nx_info(id); + nxi = lookup_nx_info(id); if (!nxi) return -ESRCH; @@ -748,7 +766,7 @@ int vc_set_ncaps(uint32_t id, void __use if (copy_from_user (&vc_data, data, sizeof(vc_data))) return -EFAULT; - nxi = locate_nx_info(id); + nxi = lookup_nx_info(id); if (!nxi) return -ESRCH; diff -NurpP --minimal linux-2.6.16-rc5-vs2.0.2-rc10.2/kernel/vserver/proc.c linux-2.6.16-rc5-vs2.0.2-rc10.x/kernel/vserver/proc.c --- linux-2.6.16-rc5-vs2.0.2-rc10.2/kernel/vserver/proc.c 2006-03-07 01:37:47 +0100 +++ linux-2.6.16-rc5-vs2.0.2-rc10.x/kernel/vserver/proc.c 2006-03-10 22:11:58 +0100 @@ -76,7 +76,7 @@ int proc_xid_info (int vid, char *buffer struct vx_info *vxi; int length; - vxi = locate_vx_info(vid); + vxi = lookup_vx_info(vid); if (!vxi) return 0; length = sprintf(buffer, @@ -96,7 +96,7 @@ int proc_xid_status (int vid, char *buff struct vx_info *vxi; int length; - vxi = locate_vx_info(vid); + vxi = lookup_vx_info(vid); if (!vxi) return 0; length = sprintf(buffer, @@ -122,7 +122,7 @@ int proc_xid_limit (int vid, char *buffe struct vx_info *vxi; int length; - vxi = locate_vx_info(vid); + vxi = lookup_vx_info(vid); if (!vxi) return 0; length = vx_info_proc_limit(&vxi->limit, buffer); @@ -135,7 +135,7 @@ int proc_xid_sched (int vid, char *buffe struct vx_info *vxi; int length; - vxi = locate_vx_info(vid); + vxi = lookup_vx_info(vid); if (!vxi) return 0; length = vx_info_proc_sched(&vxi->sched, buffer); @@ -148,7 +148,7 @@ int proc_xid_cvirt (int vid, char *buffe struct vx_info *vxi; int length; - vxi = locate_vx_info(vid); + vxi = lookup_vx_info(vid); if (!vxi) return 0; vx_update_load(vxi); @@ -162,7 +162,7 @@ int proc_xid_cacct (int vid, char *buffe struct vx_info *vxi; int length; - vxi = locate_vx_info(vid); + vxi = lookup_vx_info(vid); if (!vxi) return 0; length = vx_info_proc_cacct(&vxi->cacct, buffer); @@ -191,7 +191,7 @@ int proc_nid_info (int vid, char *buffer struct nx_info *nxi; int length, i; - nxi = locate_nx_info(vid); + nxi = lookup_nx_info(vid); if (!nxi) return 0; length = sprintf(buffer, @@ -215,7 +215,7 @@ int proc_nid_status (int vid, char *buff struct nx_info *nxi; int length; - nxi = locate_nx_info(vid); + nxi = lookup_nx_info(vid); if (!nxi) return 0; length = sprintf(buffer, @@ -553,7 +553,7 @@ struct dentry *proc_virtual_lookup(struc xid = atovid(name, len); if (xid < 0) goto out; - vxi = locate_vx_info(xid); + vxi = lookup_vx_info(xid); if (!vxi) goto out; @@ -619,7 +619,7 @@ struct dentry *proc_vnet_lookup(struct i nid = atovid(name, len); if (nid < 0) goto out; - nxi = locate_nx_info(nid); + nxi = lookup_nx_info(nid); if (!nxi) goto out; diff -NurpP --minimal linux-2.6.16-rc5-vs2.0.2-rc10.2/kernel/vserver/sched.c linux-2.6.16-rc5-vs2.0.2-rc10.x/kernel/vserver/sched.c --- linux-2.6.16-rc5-vs2.0.2-rc10.2/kernel/vserver/sched.c 2006-02-17 22:18:51 +0100 +++ linux-2.6.16-rc5-vs2.0.2-rc10.x/kernel/vserver/sched.c 2006-03-10 22:59:46 +0100 @@ -130,7 +130,7 @@ int vc_set_sched_v2(uint32_t xid, void _ if (copy_from_user (&vc_data, data, sizeof(vc_data))) return -EFAULT; - vxi = locate_vx_info(xid); + vxi = lookup_vx_info(xid); if (!vxi) return -EINVAL; @@ -174,7 +174,7 @@ int vc_set_sched(uint32_t xid, void __us if (copy_from_user (&vc_data, data, sizeof(vc_data))) return -EFAULT; - vxi = locate_vx_info(xid); + vxi = lookup_vx_info(xid); if (!vxi) return -EINVAL; diff -NurpP --minimal linux-2.6.16-rc5-vs2.0.2-rc10.2/kernel/vserver/signal.c linux-2.6.16-rc5-vs2.0.2-rc10.x/kernel/vserver/signal.c --- linux-2.6.16-rc5-vs2.0.2-rc10.2/kernel/vserver/signal.c 2006-02-17 22:18:51 +0100 +++ linux-2.6.16-rc5-vs2.0.2-rc10.x/kernel/vserver/signal.c 2006-03-10 22:11:58 +0100 @@ -107,7 +121,7 @@ int vc_wait_exit(uint32_t id, void __use struct vx_info *vxi; int ret; - vxi = locate_vx_info(id); + vxi = lookup_vx_info(id); if (!vxi) return -ESRCH;