lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[NET]: Make /proc/net per network namespace

Browse Source 
This patch makes /proc/net per network namespace.  It modifies the global
variables proc_net and proc_net_stat to be per network namespace.
The proc_net file helpers are modified to take a network namespace argument,
and all of their callers are fixed to pass &init_net for that argument.
This ensures that all of the /proc/net files are only visible and
usable in the initial network namespace until the code behind them
has been updated to be handle multiple network namespaces.

Making /proc/net per namespace is necessary as at least some files
in /proc/net depend upon the set of network devices which is per
network namespace, and even more files in /proc/net have contents
that are relevant to a single network namespace.

Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Eric W. Biederman
2007-09-12 12:01:34 +02:00
committed by David S. Miller
parent 07feaebfcc
commit 457c4cbc5a
84 changed files with 342 additions and 261 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/net/tokenring/lanstreamer.c
View File

@@ -123,6 +123,7 @@
#include <linux/bitops.h>
#include <linux/jiffies.h>
#include <net/net_namespace.h>
#include <net/checksum.h>
#include <asm/io.h>
@@ -250,7 +251,7 @@ static int __devinit streamer_init_one(struct pci_dev *pdev,
#if STREAMER_NETWORK_MONITOR
#ifdef CONFIG_PROC_FS
if (!dev_streamer)
create_proc_read_entry("net/streamer_tr", 0, 0,
create_proc_read_entry("streamer_tr", 0, init_net.proc_net,
streamer_proc_info, NULL);
streamer_priv->next = dev_streamer;
dev_streamer = streamer_priv;
@@ -423,7 +424,7 @@ static void __devexit streamer_remove_one(struct pci_dev *pdev)
}
}
if (!dev_streamer)
remove_proc_entry("net/streamer_tr", NULL);
remove_proc_entry("streamer_tr", init_net.proc_net);
}
#endif
#endif

9
drivers/net/tokenring/olympic.c
View File

@@ -102,6 +102,7 @@
#include <linux/jiffies.h>
#include <net/checksum.h>
#include <net/net_namespace.h>
#include <asm/io.h>
#include <asm/system.h>
@@ -268,9 +269,9 @@ static int __devinit olympic_probe(struct pci_dev *pdev, const struct pci_device
printk("Olympic: %s registered as: %s\n",olympic_priv->olympic_card_name,dev->name);
if (olympic_priv->olympic_network_monitor) { /* Must go after register_netdev as we need the device name */
char proc_name[20] ;
strcpy(proc_name,"net/olympic_") ;
strcpy(proc_name,"olympic_") ;
strcat(proc_name,dev->name) ;
create_proc_read_entry(proc_name,0,NULL,olympic_proc_info,(void *)dev) ;
create_proc_read_entry(proc_name,0,init_net.proc_net,olympic_proc_info,(void *)dev) ;
printk("Olympic: Network Monitor information: /proc/%s\n",proc_name);
}
return 0 ;
@@ -1752,9 +1753,9 @@ static void __devexit olympic_remove_one(struct pci_dev *pdev)
if (olympic_priv->olympic_network_monitor) {
char proc_name[20] ;
strcpy(proc_name,"net/olympic_") ;
strcpy(proc_name,"olympic_") ;
strcat(proc_name,dev->name) ;
remove_proc_entry(proc_name,NULL);
remove_proc_entry(proc_name,init_net.proc_net);
}
unregister_netdev(dev) ;
iounmap(olympic_priv->olympic_mmio) ;