git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
kernel
/
vserver
/
legacynet.c
diff --git
a/kernel/vserver/legacynet.c
b/kernel/vserver/legacynet.c
index
2df0af9
..
ede3ca6
100644
(file)
--- a/
kernel/vserver/legacynet.c
+++ b/
kernel/vserver/legacynet.c
@@
-5,7
+5,7
@@
* Virtual Server: Legacy Network Funtions
*
* Copyright (C) 2001-2003 Jacques Gelinas
* Virtual Server: Legacy Network Funtions
*
* Copyright (C) 2001-2003 Jacques Gelinas
- * Copyright (C) 2003-200
5
Herbert Pötzl
+ * Copyright (C) 2003-200
7
Herbert Pötzl
*
* V0.01 broken out from legacy.c
*
*
* V0.01 broken out from legacy.c
*
@@
-15,8
+15,7
@@
#include <linux/vs_context.h>
#include <linux/vs_network.h>
#include <linux/vserver/legacy.h>
#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/mnt_namespace.h>
#include <linux/err.h>
#include <asm/errno.h>
#include <linux/err.h>
#include <asm/errno.h>
@@
-78,6
+77,7
@@
int vc_set_ipv4root(uint32_t nbip, void __user *data)
printk("!!! switching nx_info %p->%p\n", nxi, new_nxi);
nx_migrate_task(current, new_nxi);
printk("!!! switching nx_info %p->%p\n", nxi, new_nxi);
nx_migrate_task(current, new_nxi);
+ release_nx_info(new_nxi, NULL);
put_nx_info(new_nxi);
return 0;
}
put_nx_info(new_nxi);
return 0;
}