This commit was manufactured by cvs2svn to create tag

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

diff --git a/kernel/vserver/helper.c b/kernel/vserver/helper.c
index ce8f971..023bbee 100644 (file)
--- a/kernel/vserver/helper.c
+++ b/kernel/vserver/helper.c
@@ -13,7 +13,8 @@
 #include <linux/errno.h>
 #include <linux/reboot.h>
 #include <linux/kmod.h>
-#include <linux/sched.h>
+#include <linux/vserver.h>
+#include <linux/vs_base.h>
 #include <linux/vs_context.h>
 
 #include <asm/uaccess.h>
@@ -89,34 +90,3 @@ long vs_reboot(unsigned int cmd, void * arg)
        return 0;
 }
 
-long vs_context_state(unsigned int cmd)
-{
-       char id_buf[8], cmd_buf[32];
-
-       char *argv[] = {vshelper_path, NULL, id_buf, NULL, 0};
-       char *envp[] = {"HOME=/", "TERM=linux",
-                       "PATH=/sbin:/usr/sbin:/bin:/usr/bin", cmd_buf, 0};
-
-       snprintf(id_buf, sizeof(id_buf)-1, "%d", vx_current_xid());
-       snprintf(cmd_buf, sizeof(cmd_buf)-1, "VS_CMD=%08x", cmd);
-
-       switch (cmd) {
-       case VS_CONTEXT_CREATED:
-               argv[1] = "startup";
-               break;
-       case VS_CONTEXT_DESTROY:
-               argv[1] = "shutdown";
-               break;
-       default:
-               return 0;
-       }
-
-       if (call_usermodehelper(*argv, argv, envp, 1)) {
-               printk( KERN_WARNING
-                       "vs_context_state(): failed to exec (%s %s %s %s)\n",
-                       vshelper_path, argv[1], argv[2], argv[3]);
-               return 0;
-       }
-       return 0;
-}
-