From: Sapan Bhatia <sapanb@cs.princeton.edu>
Date: Mon, 20 Oct 2008 17:36:45 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: trellis-2.6.22-Jan-2009~2
X-Git-Url: http://git.onelab.eu/?p=linux-2.6.git;a=commitdiff_plain;h=028be8bde09b04c122ada1bb87197fe1e7a0e1c0

---

diff --git a/linux-2.6-760-unshare-netns-fix.patch b/linux-2.6-760-unshare-netns-fix.patch
index 519237f60..1b1d3c31f 100644
--- a/linux-2.6-760-unshare-netns-fix.patch
+++ b/linux-2.6-760-unshare-netns-fix.patch
@@ -152,3 +152,34 @@ diff -Nurb linux-2.6.22-600/kernel/vserver/space.c linux-2.6.22-601/kernel/vserv
  out:
  	return nsproxy;
  }
+--- kernel/vserver/space.c.orig	2008-10-10 11:37:58.000000000 -0400
++++ kernel/vserver/space.c	2008-10-20 13:36:17.000000000 -0400
+@@ -91,7 +91,7 @@
+ 		nsproxy->net_ns = new_nsproxy->net_ns;
+ 		if (nsproxy->net_ns) {
+ 			get_net(nsproxy->net_ns);
+- 		    	printk(KERN_ALERT "Cloning network namespace\n"); 
++ 		    printk(KERN_ALERT "Cloning network namespace\n"); 
+ 		}	
+ 	} else
+ 		old_net = NULL;
+@@ -168,9 +168,6 @@
+ 	if (!mask)
+ 		mask = vxi->vx_nsmask;
+ 
+-	if ((mask & vxi->vx_nsmask) != mask)
+-		return -EINVAL;
+-
+ 	proxy = vxi->vx_nsproxy;
+ 	fs = vxi->vx_fs;
+ 
+@@ -220,9 +217,6 @@
+ 	if (!mask)
+ 		mask = space_mask.mask;
+ 
+-	if ((mask & space_mask.mask) != mask)
+-		return -EINVAL;
+-
+ 	proxy_vxi = vxi->vx_nsproxy;
+ 	fs_vxi = vxi->vx_fs;
+