fedora core 6 1.2949 + vserver 2.2.0

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

diff --git a/kernel/vserver/legacy.c b/kernel/vserver/legacy.c
index ec603ef..51533ac 100644 (file)
--- a/kernel/vserver/legacy.c
+++ b/kernel/vserver/legacy.c
@@ -4,9 +4,10 @@
  *  Virtual Server: Legacy Funtions
  *
  *  Copyright (C) 2001-2003  Jacques Gelinas
- *  Copyright (C) 2003-2005  Herbert Pötzl
+ *  Copyright (C) 2003-2007  Herbert Pötzl
  *
  *  V0.01  broken out from vcontext.c V0.05
+ *  V0.02  updated to spaces *sigh*
  *
  */
 
@@ -14,8 +15,8 @@
 #include <linux/vs_context.h>
 #include <linux/vs_network.h>
 #include <linux/vserver/legacy.h>
-#include <linux/vserver/namespace.h>
-#include <linux/namespace.h>
+#include <linux/vserver/space.h>
+// #include <linux/mnt_namespace.h>
 
 #include <asm/errno.h>
 #include <asm/uaccess.h>
@@ -59,7 +60,9 @@ int vc_new_s_context(uint32_t ctx, void __user *data)
                return ret;
        }
 
-       if (!vx_check(0, VX_ADMIN) || !capable(CAP_SYS_ADMIN))
+       if (!vx_check(0, VS_ADMIN) || !capable(CAP_SYS_ADMIN)
+               /* might make sense in the future, or not ... */
+               || vx_flags(VX_INFO_PRIVATE, 0))
                return -EPERM;
 
        /* ugly hack for Spectator */
@@ -85,20 +88,20 @@ int vc_new_s_context(uint32_t ctx, void __user *data)
                vx_info_flags(new_vxi, VX_INFO_PRIVATE, 0))
                goto out_put;
 
+       ret = vx_migrate_task(current, new_vxi,
+               vx_info_flags(new_vxi, VXF_STATE_SETUP, 0));
        new_vxi->vx_flags &= ~VXF_STATE_SETUP;
 
-       ret = vx_migrate_task(current, new_vxi);
        if (ret == 0) {
                current->vx_info->vx_bcaps &= (~vc_data.remove_cap);
                new_vxi->vx_flags |= vc_data.flags;
                if (vc_data.flags & VX_INFO_INIT)
                        vx_set_initpid(new_vxi, current->tgid);
                if (vc_data.flags & VX_INFO_NAMESPACE)
-                       vx_set_namespace(new_vxi,
-                               current->namespace, current->fs);
+                       vx_set_space(new_vxi, CLONE_NEWNS|CLONE_FS);
                if (vc_data.flags & VX_INFO_NPROC)
-                       new_vxi->limit.rlim[RLIMIT_NPROC] =
-                               current->signal->rlim[RLIMIT_NPROC].rlim_max;
+                       __rlim_set(&new_vxi->limit, RLIMIT_NPROC,
+                               current->signal->rlim[RLIMIT_NPROC].rlim_max);
 
                /* tweak some defaults for legacy */
                new_vxi->vx_flags |= (VXF_HIDE_NETIF|VXF_INFO_INIT);