X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=sidebyside;f=kernel%2Fvserver%2Fnamespace.c;h=1482e62f9ee0ac6be366d6113c64dab19ad3ac62;hb=6a77f38946aaee1cd85eeec6cf4229b204c15071;hp=3dc0f351c4ad65d2daec81cc15c4de2039b362c4;hpb=9213980e6a70d8473e0ffd4b39ab5b6caaba9ff5;p=linux-2.6.git

diff --git a/kernel/vserver/namespace.c b/kernel/vserver/namespace.c
index 3dc0f351c..1482e62f9 100644
--- a/kernel/vserver/namespace.c
+++ b/kernel/vserver/namespace.c
@@ -3,7 +3,7 @@
  *
  *  Virtual Server: Context Namespace Support
  *
- *  Copyright (C) 2003-2004  Herbert Pötzl
+ *  Copyright (C) 2003-2005  Herbert Pötzl
  *
  *  V0.01  broken out from context.c 0.07
  *  V0.02  added task locking for namespace
@@ -12,11 +12,12 @@
 
 #include <linux/config.h>
 #include <linux/utsname.h>
-#include <linux/vserver/namespace.h>
-#include <linux/vs_base.h>
+#include <linux/sched.h>
 #include <linux/vs_context.h>
-#include <linux/namespace.h>
+#include <linux/vserver/namespace.h>
 #include <linux/dcache.h>
+#include <linux/mount.h>
+#include <linux/fs.h>
 
 #include <asm/errno.h>
 #include <asm/uaccess.h>
@@ -57,11 +58,11 @@ int vc_set_vhi_name(uint32_t id, void __user *data)
 		return -EPERM;
 	if (copy_from_user (&vc_data, data, sizeof(vc_data)))
 		return -EFAULT;
-	
+
 	vxi = locate_vx_info(id);
 	if (!vxi)
 		return -ESRCH;
-	
+
 	name = vx_vhi_name(vxi, vc_data.field);
 	if (name)
 		memcpy(name, vc_data.name, 65);
@@ -85,7 +86,7 @@ int vc_get_vhi_name(uint32_t id, void __user *data)
 	name = vx_vhi_name(vxi, vc_data.field);
 	if (!name)
 		goto out_put;
-			
+
 	memcpy(vc_data.name, name, 65);
 	if (copy_to_user (data, &vc_data, sizeof(vc_data)))
 		return -EFAULT;
@@ -145,7 +146,7 @@ int vc_enter_namespace(uint32_t id, void *data)
 	old_ns = current->namespace;
 	old_fs = current->fs;
 	get_namespace(vxi->vx_namespace);
-	current->namespace = vxi->vx_namespace;	
+	current->namespace = vxi->vx_namespace;
 	current->fs = fs;
 	task_unlock(current);