From: Daniel Hokka Zakrisson <dhokka@cs.princeton.edu>
Date: Fri, 15 Feb 2008 19:44:19 +0000 (+0000)
Subject: Show /proc/virtual/* and /proc/virtnet/* in slices.
X-Git-Tag: linux-2.6-22-2~34
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=6df1aadeae32cd1009f5754ed4ae7820c3a69835;p=linux-2.6.git

Show /proc/virtual/* and /proc/virtnet/* in slices.
---

diff --git a/kernel-2.6.spec b/kernel-2.6.spec
index fcd6d8a95..1db746e5c 100644
--- a/kernel-2.6.spec
+++ b/kernel-2.6.spec
@@ -162,6 +162,7 @@ Patch540: linux-2.6-540-oom-kill.patch
 Patch550: linux-2.6-550-raise-default-nfile-ulimit.patch
 Patch560: linux-2.6-560-mmconf.patch
 Patch570: linux-2.6-570-tagxid.patch
+Patch580: linux-2.6-580-show-proc-virt.patch
 
 # See also the file named 'sources' here for the related checksums
 # NOTE. iwlwifi should be in-kernel starting from 2.6.24
@@ -349,6 +350,7 @@ KERNEL_PREVIOUS=vanilla
 %ApplyPatch 550
 %ApplyPatch 560
 %ApplyPatch 570
+%ApplyPatch 580
 
 # NetNS conflict-resolving patch for VINI. Will work with patch vini_pl_patch-1 but may
 # break with later patches.
diff --git a/linux-2.6-580-show-proc-virt.patch b/linux-2.6-580-show-proc-virt.patch
new file mode 100644
index 000000000..d6e7bd9f4
--- /dev/null
+++ b/linux-2.6-580-show-proc-virt.patch
@@ -0,0 +1,24 @@
+diff -Nurp linux-2.6.22-570/kernel/vserver/context.c linux-2.6.22-580/kernel/vserver/context.c
+--- linux-2.6.22-570/kernel/vserver/context.c	2008-02-15 20:36:20.000000000 +0100
++++ linux-2.6.22-580/kernel/vserver/context.c	2008-02-15 20:39:37.000000000 +0100
+@@ -406,7 +406,7 @@ int get_xid_list(int index, unsigned int
+ 	int hindex, nr_xids = 0;
+ 
+ 	/* only show current and children */
+-	if (!vx_check(0, VS_ADMIN | VS_WATCH)) {
++	if (!vx_check(0, VS_ADMIN | VS_WATCH) && vx_flags(VXF_HIDE_VINFO, 0)) {
+ 		if (index > 0)
+ 			return 0;
+ 		xids[nr_xids] = vx_current_xid();
+diff -Nurp linux-2.6.22-570/kernel/vserver/network.c linux-2.6.22-580/kernel/vserver/network.c
+--- linux-2.6.22-570/kernel/vserver/network.c	2008-02-15 20:36:20.000000000 +0100
++++ linux-2.6.22-580/kernel/vserver/network.c	2008-02-15 20:40:34.000000000 +0100
+@@ -390,7 +390,7 @@ int get_nid_list(int index, unsigned int
+ 	int hindex, nr_nids = 0;
+ 
+ 	/* only show current and children */
+-	if (!nx_check(0, VS_ADMIN | VS_WATCH)) {
++	if (!nx_check(0, VS_ADMIN | VS_WATCH) && vx_flags(VXF_HIDE_VINFO, 0)) {
+ 		if (index > 0)
+ 			return 0;
+ 		nids[nr_nids] = nx_current_nid();