patch-2.6.6-vs1.9.1

[linux-2.6.git] / kernel / fork.c

diff --git a/kernel/fork.c b/kernel/fork.c
index 4336cf0..fa3f828 100644 (file)
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -77,6 +77,7 @@ static kmem_cache_t *task_struct_cachep;
 static void free_task(struct task_struct *tsk)
 {
        free_thread_info(tsk->thread_info);
+       vxdprintk("freeing up task %p\n", tsk);
        clr_vx_info(&tsk->vx_info);
        clr_nx_info(&tsk->nx_info);
        free_task_struct(tsk);
@@ -869,7 +870,6 @@ struct task_struct *copy_process(unsigned long clone_flags,
        int retval;
        struct task_struct *p = NULL;
        struct vx_info *vxi;
-       struct nx_info *nxi;
 
        if ((clone_flags & (CLONE_NEWNS|CLONE_FS)) == (CLONE_NEWNS|CLONE_FS))
                return ERR_PTR(-EINVAL);
@@ -899,8 +899,10 @@ struct task_struct *copy_process(unsigned long clone_flags,
        if (!p)
                goto fork_out;
 
-       vxi = get_vx_info(current->vx_info);
-       nxi = get_nx_info(current->nx_info);
+       p->vx_info = NULL;
+       set_vx_info(&p->vx_info, current->vx_info);
+       p->nx_info = NULL;
+       set_nx_info(&p->nx_info, current->nx_info);
 
        /* check vserver memory */
        if (p->mm && !(clone_flags & CLONE_VM)) {
@@ -915,6 +917,7 @@ struct task_struct *copy_process(unsigned long clone_flags,
        }
 
        retval = -EAGAIN;
+       vxi = current->vx_info;
        if (vxi && (atomic_read(&vxi->limit.res[RLIMIT_NPROC])
                >= vxi->limit.rlim[RLIMIT_NPROC]))
                goto bad_fork_free;