Revert to Fedora kernel-2.6.17-1.2187_FC5 patched with vs2.0.2.1; there are too many...

[linux-2.6.git] / kernel / vserver / context.c

diff --git a/kernel/vserver/context.c b/kernel/vserver/context.c
index aa2b220..c80df75 100644 (file)
--- a/kernel/vserver/context.c
+++ b/kernel/vserver/context.c
@@ -24,14 +24,14 @@
 #include <linux/namespace.h>
 
 #include <linux/sched.h>
+#include <linux/vs_base.h>
+#include <linux/vs_context.h>
+#include <linux/vs_limit.h>
 #include <linux/vserver/network.h>
 #include <linux/vserver/legacy.h>
 #include <linux/vserver/limit.h>
 #include <linux/vserver/debug.h>
 #include <linux/vserver/limit_int.h>
-
-#include <linux/vs_context.h>
-#include <linux/vs_limit.h>
 #include <linux/vserver/context_cmd.h>
 
 #include <linux/err.h>
@@ -668,19 +668,11 @@ void      exit_vx_info(struct task_struct *p, int code)
                vx_nproc_dec(p);
 
                vxi->exit_code = code;
-               release_vx_info(vxi, p);
-       }
-}
-
-void   exit_vx_info_early(struct task_struct *p, int code)
-{
-       struct vx_info *vxi = p->vx_info;
-
-       if (vxi) {
                if (vxi->vx_initpid == p->tgid)
                        vx_exit_init(vxi, p, code);
                if (vxi->vx_reaper == p)
                        vx_set_reaper(vxi, child_reaper);
+               release_vx_info(vxi, p);
        }
 }