From: Andy Bavier <acb@cs.princeton.edu>
Date: Thu, 20 Mar 2008 21:11:05 +0000 (+0000)
Subject: Added some missing definitions
X-Git-Tag: trellis-2.6.22-Jan-2009~27
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=ba3b62c320cd9bcedee4dfb950a098dfd4e579da;p=linux-2.6.git

Added some missing definitions
---

diff --git a/linux-2.6-595-vserver-setspace.patch b/linux-2.6-595-vserver-setspace.patch
index 62f5d27e1..4d63781da 100644
--- a/linux-2.6-595-vserver-setspace.patch
+++ b/linux-2.6-595-vserver-setspace.patch
@@ -9,7 +9,7 @@ diff -Nurb linux-2.6.22-594/arch/i386/kernel/syscall_table.S linux-2.6.22-595/ar
 diff -Nurb linux-2.6.22-594/kernel/nsproxy.c linux-2.6.22-595/kernel/nsproxy.c
 --- linux-2.6.22-594/kernel/nsproxy.c	2008-03-20 13:29:30.000000000 -0400
 +++ linux-2.6.22-595/kernel/nsproxy.c	2008-03-20 14:28:05.000000000 -0400
-@@ -23,11 +23,51 @@
+@@ -23,11 +23,55 @@
  #include <linux/pid_namespace.h>
  #include <linux/vserver/global.h>
  #include <linux/vserver/debug.h>
@@ -17,6 +17,7 @@ diff -Nurb linux-2.6.22-594/kernel/nsproxy.c linux-2.6.22-595/kernel/nsproxy.c
 +
 +#include <net/net_namespace.h>
 +
++int vx_enter_space(struct task_struct *, struct vx_info *, unsigned long);
  
  static struct kmem_cache *nsproxy_cachep;
  
@@ -24,7 +25,10 @@ diff -Nurb linux-2.6.22-594/kernel/nsproxy.c linux-2.6.22-595/kernel/nsproxy.c
  
 +asmlinkage long sys_set_space(int pid, int id, int toggle, unsigned long unshare_flags) {
 +	struct task_struct *p;
++       struct fs_struct *fs_cur;
++       struct nsproxy *proxy_cur;
 +	int ret = 0;
++
 +	if (unshare_flags & ~CLONE_NEWNET) {
 +		printk(KERN_ALERT "sys_set_space currently only supports CLONE_NEWNET\n");
 +		return -EINVAL;