X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=kernel%2Fvserver%2Flegacy.c;h=482ea8f24ff0083743f83fde83cda3fe1605ba62;hb=c7b5ebbddf7bcd3651947760f423e3783bbe6573;hp=8fe6fed6d81136b632c1fa0140c6736c16319959;hpb=d46bc780027c5439db9f72d42c0732775b53925a;p=linux-2.6.git

diff --git a/kernel/vserver/legacy.c b/kernel/vserver/legacy.c
index 8fe6fed6d..482ea8f24 100644
--- a/kernel/vserver/legacy.c
+++ b/kernel/vserver/legacy.c
@@ -11,12 +11,14 @@
  */
 
 #include <linux/config.h>
+#include <linux/sched.h>
+#include <linux/namespace.h>
 #include <linux/vserver/legacy.h>
-#include <linux/vserver/context.h>
 #include <linux/vserver/namespace.h>
 #include <linux/vserver.h>
-#include <linux/sched.h>
-#include <linux/namespace.h>
+#include <linux/vs_base.h>
+#include <linux/vs_context.h>
+#include <linux/vs_network.h>
 
 #include <asm/errno.h>
 #include <asm/uaccess.h>
@@ -58,9 +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) || vx_flags(VX_INFO_LOCK, 0))
+		!capable(CAP_SYS_ADMIN) || vx_flags(VX_INFO_PRIVATE, 0))
 		return -EPERM;
 
 	/* ugly hack for Spectator */
@@ -72,7 +74,7 @@ int vc_new_s_context(uint32_t ctx, void __user *data)
 	if (((ctx > MAX_S_CONTEXT) && (ctx != VX_DYNAMIC_ID)) ||
 		(ctx == 0))
 		return -EINVAL;
-		
+
 	if ((ctx == VX_DYNAMIC_ID) || (ctx < MIN_D_CONTEXT))
 		new_vxi = locate_or_create_vx_info(ctx);
 	else
@@ -81,7 +83,7 @@ int vc_new_s_context(uint32_t ctx, void __user *data)
 	if (!new_vxi)
 		return -EINVAL;
 	new_vxi->vx_flags &= ~(VXF_STATE_SETUP|VXF_STATE_INIT);
-	
+
 	ret = vx_migrate_task(current, new_vxi);
 	if (ret == 0) {
 		current->vx_info->vx_bcaps &= (~vc_data.remove_cap);
@@ -122,7 +124,7 @@ int vc_set_ipv4root(uint32_t nbip, void __user *data)
 		err = 0;
 	else if (nxi) {
 		int found = 0;
-		
+
 		// We are allowed to select a subset of the currently
 		// installed IP numbers. No new one allowed
 		// We can't change the broadcast address though