diff -NurpP --minimal linux-2.6.17.7-vs2.1.1-rc27.5/kernel/vserver/namespace.c linux-2.6.17.7-vs2.1.1-rc27.6/kernel/vserver/namespace.c
--- linux-2.6.17.7-vs2.1.1-rc27.5/kernel/vserver/namespace.c	2006-07-27 19:03:51 +0200
+++ linux-2.6.17.7-vs2.1.1-rc27.6/kernel/vserver/namespace.c	2006-07-30 03:46:39 +0200
@@ -3,10 +3,11 @@
  *
  *  Virtual Server: Context Namespace Support
  *
- *  Copyright (C) 2003-2005  Herbert Pötzl
+ *  Copyright (C) 2003-2006  Herbert Pötzl
  *
  *  V0.01  broken out from context.c 0.07
  *  V0.02  added task locking for namespace
+ *  V0.03  broken out vx_enter_namespace
  *
  */
 
@@ -27,26 +28,7 @@
 
 #include <linux/namespace.h>
 
-int vx_set_namespace(struct vx_info *vxi, struct namespace *ns, struct fs_struct *fs)
-{
-	struct fs_struct *fs_copy;
-
-	if (vxi->vx_namespace)
-		return -EPERM;
-	if (!ns || !fs)
-		return -EINVAL;
-
-	fs_copy = copy_fs_struct(fs);
-	if (!fs_copy)
-		return -ENOMEM;
-
-	get_namespace(ns);
-	vxi->vx_namespace = ns;
-	vxi->vx_fs = fs_copy;
-	return 0;
-}
-
-int vc_enter_namespace(struct vx_info *vxi, void __user *data)
+int vx_enter_namespace(struct vx_info *vxi)
 {
 	struct fs_struct *old_fs, *fs;
 	struct namespace *old_ns;
@@ -71,6 +53,30 @@
 	return 0;
 }
 
+int vx_set_namespace(struct vx_info *vxi, struct namespace *ns, struct fs_struct *fs)
+{
+	struct fs_struct *fs_copy;
+
+	if (vxi->vx_namespace)
+		return -EPERM;
+	if (!ns || !fs)
+		return -EINVAL;
+
+	fs_copy = copy_fs_struct(fs);
+	if (!fs_copy)
+		return -ENOMEM;
+
+	get_namespace(ns);
+	vxi->vx_namespace = ns;
+	vxi->vx_fs = fs_copy;
+	return 0;
+}
+
+int vc_enter_namespace(struct vx_info *vxi, void __user *data)
+{
+	return vx_enter_namespace(vxi);
+}
+
 int vc_set_namespace(struct vx_info *vxi, void __user *data)
 {
 	struct fs_struct *fs;