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

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>

84 files changed, 342 insertions, 261 deletions

diff --git a/drivers/isdn/divert/divert_procfs.c b/drivers/isdn/divert/divert_procfs.c
index 559a0d0244cf..4fd4c46892e3 100644
--- a/drivers/isdn/divert/divert_procfs.c
+++ b/drivers/isdn/divert/divert_procfs.c
@@ -17,6 +17,7 @@
 #include <linux/fs.h>
 #endif
 #include <linux/isdnif.h>
+#include <net/net_namespace.h>
 #include "isdn_divert.h"
 
 
@@ -284,12 +285,12 @@ divert_dev_init(void)
         init_waitqueue_head(&rd_queue);
 
 #ifdef CONFIG_PROC_FS
-        isdn_proc_entry = proc_mkdir("net/isdn", NULL);
+        isdn_proc_entry = proc_mkdir("isdn", init_net.proc_net);
         if (!isdn_proc_entry)
                 return (-1);
         isdn_divert_entry = create_proc_entry("divert", S_IFREG | S_IRUGO, isdn_proc_entry);
         if (!isdn_divert_entry) {
-                remove_proc_entry("net/isdn", NULL);
+                remove_proc_entry("isdn", init_net.proc_net);
                 return (-1);
         }
         isdn_divert_entry->proc_fops = &isdn_fops; 
@@ -309,7 +310,7 @@ divert_dev_deinit(void)
 
 #ifdef CONFIG_PROC_FS
         remove_proc_entry("divert", isdn_proc_entry);
-        remove_proc_entry("net/isdn", NULL);
+        remove_proc_entry("isdn", init_net.proc_net);
 #endif  /* CONFIG_PROC_FS */
 
         return (0);
diff --git a/drivers/isdn/hardware/eicon/diva_didd.c b/drivers/isdn/hardware/eicon/diva_didd.c
index d755d904e62c..993b14cf1778 100644
--- a/drivers/isdn/hardware/eicon/diva_didd.c
+++ b/drivers/isdn/hardware/eicon/diva_didd.c
@@ -15,6 +15,7 @@
 #include <linux/init.h>
 #include <linux/kernel.h>
 #include <linux/proc_fs.h>
+#include <net/net_namespace.h>
 
 #include "platform.h"
 #include "di_defs.h"
@@ -86,7 +87,7 @@ proc_read(char *page, char **start, off_t off, int count, int *eof,
 
 static int DIVA_INIT_FUNCTION create_proc(void)
 {
-        proc_net_eicon = proc_mkdir("net/eicon", NULL);
+        proc_net_eicon = proc_mkdir("eicon", init_net.proc_net);
 
         if (proc_net_eicon) {
                 if ((proc_didd =
@@ -102,7 +103,7 @@ static int DIVA_INIT_FUNCTION create_proc(void)
 static void remove_proc(void)
 {
         remove_proc_entry(DRIVERLNAME, proc_net_eicon);
-        remove_proc_entry("net/eicon", NULL);
+        remove_proc_entry("eicon", init_net.proc_net);
 }
 
 static int DIVA_INIT_FUNCTION divadidd_init(void)
diff --git a/drivers/isdn/hysdn/hysdn_procconf.c b/drivers/isdn/hysdn/hysdn_procconf.c
index dc477e0aab0e..27d890b48f88 100644
--- a/drivers/isdn/hysdn/hysdn_procconf.c
+++ b/drivers/isdn/hysdn/hysdn_procconf.c
@@ -16,6 +16,7 @@
 #include <linux/proc_fs.h>
 #include <linux/pci.h>
 #include <linux/smp_lock.h>
+#include <net/net_namespace.h>
 
 #include "hysdn_defs.h"
 
@@ -392,7 +393,7 @@ hysdn_procconf_init(void)
         hysdn_card *card;
         unsigned char conf_name[20];
 
-        hysdn_proc_entry = proc_mkdir(PROC_SUBDIR_NAME, proc_net);
+        hysdn_proc_entry = proc_mkdir(PROC_SUBDIR_NAME, init_net.proc_net);
         if (!hysdn_proc_entry) {
                 printk(KERN_ERR "HYSDN: unable to create hysdn subdir\n");
                 return (-1);
@@ -437,5 +438,5 @@ hysdn_procconf_release(void)
                 card = card->next;      /* point to next card */
         }
 
-        remove_proc_entry(PROC_SUBDIR_NAME, proc_net);
+        remove_proc_entry(PROC_SUBDIR_NAME, init_net.proc_net);
 }
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 1afda3230def..5de648f90a45 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -75,6 +75,7 @@
 #include <linux/if_vlan.h>
 #include <linux/if_bonding.h>
 #include <net/route.h>
+#include <net/net_namespace.h>
 #include "bonding.h"
 #include "bond_3ad.h"
 #include "bond_alb.h"
@@ -3144,7 +3145,7 @@ static void bond_create_proc_dir(void)
 {
         int len = strlen(DRV_NAME);
 
-        for (bond_proc_dir = proc_net->subdir; bond_proc_dir;
+        for (bond_proc_dir = init_net.proc_net->subdir; bond_proc_dir;
              bond_proc_dir = bond_proc_dir->next) {
                 if ((bond_proc_dir->namelen == len) &&
                     !memcmp(bond_proc_dir->name, DRV_NAME, len)) {
@@ -3153,7 +3154,7 @@ static void bond_create_proc_dir(void)
         }
 
         if (!bond_proc_dir) {
-                bond_proc_dir = proc_mkdir(DRV_NAME, proc_net);
+                bond_proc_dir = proc_mkdir(DRV_NAME, init_net.proc_net);
                 if (bond_proc_dir) {
                         bond_proc_dir->owner = THIS_MODULE;
                 } else {
@@ -3188,7 +3189,7 @@ static void bond_destroy_proc_dir(void)
                         bond_proc_dir->owner = NULL;
                 }
         } else {
-                remove_proc_entry(DRV_NAME, proc_net);
+                remove_proc_entry(DRV_NAME, init_net.proc_net);
                 bond_proc_dir = NULL;
         }
 }
diff --git a/drivers/net/hamradio/bpqether.c b/drivers/net/hamradio/bpqether.c
index cc0ee93669ea..1699d42d13ca 100644
--- a/drivers/net/hamradio/bpqether.c
+++ b/drivers/net/hamradio/bpqether.c
@@ -83,6 +83,7 @@
 
 #include <net/ip.h>
 #include <net/arp.h>
+#include <net/net_namespace.h>
 
 #include <linux/bpqether.h>
 
@@ -594,7 +595,7 @@ static int bpq_device_event(struct notifier_block *this,unsigned long event, voi
 static int __init bpq_init_driver(void)
 {
 #ifdef CONFIG_PROC_FS
-        if (!proc_net_fops_create("bpqether", S_IRUGO, &bpq_info_fops)) {
+        if (!proc_net_fops_create(&init_net, "bpqether", S_IRUGO, &bpq_info_fops)) {
                 printk(KERN_ERR
                         "bpq: cannot create /proc/net/bpqether entry.\n");
                 return -ENOENT;
@@ -618,7 +619,7 @@ static void __exit bpq_cleanup_driver(void)
 
         unregister_netdevice_notifier(&bpq_dev_notifier);
 
-        proc_net_remove("bpqether");
+        proc_net_remove(&init_net, "bpqether");
 
         rtnl_lock();
         while (!list_empty(&bpq_devices)) {
diff --git a/drivers/net/hamradio/scc.c b/drivers/net/hamradio/scc.c
index 6fdaad5a4577..39b3b82aa4a4 100644
--- a/drivers/net/hamradio/scc.c
+++ b/drivers/net/hamradio/scc.c
@@ -174,6 +174,7 @@
 #include <linux/seq_file.h>
 #include <linux/bitops.h>
 
+#include <net/net_namespace.h>
 #include <net/ax25.h>
 
 #include <asm/irq.h>
@@ -2114,7 +2115,7 @@ static int __init scc_init_driver (void)
         }
         rtnl_unlock();
 
-        proc_net_fops_create("z8530drv", 0, &scc_net_seq_fops);
+        proc_net_fops_create(&init_net, "z8530drv", 0, &scc_net_seq_fops);
 
         return 0;
 }
@@ -2169,7 +2170,7 @@ static void __exit scc_cleanup_driver(void)
         if (Vector_Latch)
                 release_region(Vector_Latch, 1);
 
-        proc_net_remove("z8530drv");
+        proc_net_remove(&init_net, "z8530drv");
 }
 
 MODULE_AUTHOR("Joerg Reuter <jreuter@yaina.de>");
diff --git a/drivers/net/hamradio/yam.c b/drivers/net/hamradio/yam.c
index 467559debfd6..401724ddafcd 100644
--- a/drivers/net/hamradio/yam.c
+++ b/drivers/net/hamradio/yam.c
@@ -65,6 +65,7 @@
 #include <linux/kernel.h>
 #include <linux/proc_fs.h>
 #include <linux/seq_file.h>
+#include <net/net_namespace.h>
 
 #include <asm/uaccess.h>
 #include <linux/init.h>
@@ -1142,7 +1143,7 @@ static int __init yam_init_driver(void)
         yam_timer.expires = jiffies + HZ / 100;
         add_timer(&yam_timer);
 
-        proc_net_fops_create("yam", S_IRUGO, &yam_info_fops);
+        proc_net_fops_create(&init_net, "yam", S_IRUGO, &yam_info_fops);
         return 0;
  error:
         while (--i >= 0) {
@@ -1174,7 +1175,7 @@ static void __exit yam_cleanup_driver(void)
                 kfree(p);
         }
 
-        proc_net_remove("yam");
+        proc_net_remove(&init_net, "yam");
 }
 
 /* --------------------------------------------------------------------- */
diff --git a/drivers/net/ibmveth.c b/drivers/net/ibmveth.c
index 78e28ada1e21..0c35d72f5f8d 100644
--- a/drivers/net/ibmveth.c
+++ b/drivers/net/ibmveth.c
@@ -47,6 +47,7 @@
 #include <linux/mm.h>
 #include <linux/ethtool.h>
 #include <linux/proc_fs.h>
+#include <net/net_namespace.h>
 #include <asm/semaphore.h>
 #include <asm/hvcall.h>
 #include <asm/atomic.h>
@@ -97,7 +98,7 @@ static void ibmveth_rxq_harvest_buffer(struct ibmveth_adapter *adapter);
 static struct kobj_type ktype_veth_pool;
 
 #ifdef CONFIG_PROC_FS
-#define IBMVETH_PROC_DIR "net/ibmveth"
+#define IBMVETH_PROC_DIR "ibmveth"
 static struct proc_dir_entry *ibmveth_proc_dir;
 #endif
 
@@ -1091,7 +1092,7 @@ static int __devexit ibmveth_remove(struct vio_dev *dev)
 #ifdef CONFIG_PROC_FS
 static void ibmveth_proc_register_driver(void)
 {
-        ibmveth_proc_dir = proc_mkdir(IBMVETH_PROC_DIR, NULL);
+        ibmveth_proc_dir = proc_mkdir(IBMVETH_PROC_DIR, init_net.proc_net);
         if (ibmveth_proc_dir) {
                 SET_MODULE_OWNER(ibmveth_proc_dir);
         }
@@ -1099,7 +1100,7 @@ static void ibmveth_proc_register_driver(void)
 
 static void ibmveth_proc_unregister_driver(void)
 {
-        remove_proc_entry(IBMVETH_PROC_DIR, NULL);
+        remove_proc_entry(IBMVETH_PROC_DIR, init_net.proc_net);
 }
 
 static void *ibmveth_seq_start(struct seq_file *seq, loff_t *pos)
diff --git a/drivers/net/pppoe.c b/drivers/net/pppoe.c
index 9b30cd600a64..ee8ce195c538 100644
--- a/drivers/net/pppoe.c
+++ b/drivers/net/pppoe.c
@@ -78,6 +78,7 @@
 #include <linux/proc_fs.h>
 #include <linux/seq_file.h>
 
+#include <net/net_namespace.h>
 #include <net/sock.h>
 
 #include <asm/uaccess.h>
@@ -1042,7 +1043,7 @@ static int __init pppoe_proc_init(void)
 {
         struct proc_dir_entry *p;
 
-        p = create_proc_entry("net/pppoe", S_IRUGO, NULL);
+        p = create_proc_entry("pppoe", S_IRUGO, init_net.proc_net);
         if (!p)
                 return -ENOMEM;
 
@@ -1113,7 +1114,7 @@ static void __exit pppoe_exit(void)
         dev_remove_pack(&pppoes_ptype);
         dev_remove_pack(&pppoed_ptype);
         unregister_netdevice_notifier(&pppoe_notifier);
-        remove_proc_entry("net/pppoe", NULL);
+        remove_proc_entry("pppoe", init_net.proc_net);
         proto_unregister(&pppoe_sk_proto);
 }
 
diff --git a/drivers/net/pppol2tp.c b/drivers/net/pppol2tp.c
index abe91cb595f4..2eb424ba58e5 100644
--- a/drivers/net/pppol2tp.c
+++ b/drivers/net/pppol2tp.c
@@ -91,6 +91,7 @@
 #include <linux/hash.h>
 #include <linux/sort.h>
 #include <linux/proc_fs.h>
+#include <net/net_namespace.h>
 #include <net/dst.h>
 #include <net/ip.h>
 #include <net/udp.h>
@@ -2444,7 +2445,7 @@ static int __init pppol2tp_init(void)
                 goto out_unregister_pppol2tp_proto;
 
 #ifdef CONFIG_PROC_FS
-        pppol2tp_proc = create_proc_entry("pppol2tp", 0, proc_net);
+        pppol2tp_proc = create_proc_entry("pppol2tp", 0, init_net.proc_net);
         if (!pppol2tp_proc) {
                 err = -ENOMEM;
                 goto out_unregister_pppox_proto;
@@ -2469,7 +2470,7 @@ static void __exit pppol2tp_exit(void)
         unregister_pppox_proto(PX_PROTO_OL2TP);
 
 #ifdef CONFIG_PROC_FS
-        remove_proc_entry("pppol2tp", proc_net);
+        remove_proc_entry("pppol2tp", init_net.proc_net);
 #endif
         proto_unregister(&pppol2tp_sk_proto);
 }
diff --git a/drivers/net/tokenring/lanstreamer.c b/drivers/net/tokenring/lanstreamer.c
index 5d849c089a3b..fc4495581f96 100644
--- a/drivers/net/tokenring/lanstreamer.c
+++ b/drivers/net/tokenring/lanstreamer.c
@@ -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
diff --git a/drivers/net/tokenring/olympic.c b/drivers/net/tokenring/olympic.c
index 09b3cfb8e809..c323101a895b 100644
--- a/drivers/net/tokenring/olympic.c
+++ b/drivers/net/tokenring/olympic.c
@@ -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) ; 
diff --git a/drivers/net/wireless/hostap/hostap_main.c b/drivers/net/wireless/hostap/hostap_main.c
index 446de51bab74..9a470e80ca24 100644
--- a/drivers/net/wireless/hostap/hostap_main.c
+++ b/drivers/net/wireless/hostap/hostap_main.c
@@ -24,6 +24,7 @@
 #include <linux/rtnetlink.h>
 #include <linux/wireless.h>
 #include <linux/etherdevice.h>
+#include <net/net_namespace.h>
 #include <net/iw_handler.h>
 #include <net/ieee80211.h>
 #include <net/ieee80211_crypt.h>
@@ -1093,8 +1094,8 @@ struct proc_dir_entry *hostap_proc;
 
 static int __init hostap_init(void)
 {
-        if (proc_net != NULL) {
-                hostap_proc = proc_mkdir("hostap", proc_net);
+        if (init_net.proc_net != NULL) {
+                hostap_proc = proc_mkdir("hostap", init_net.proc_net);
                 if (!hostap_proc)
                         printk(KERN_WARNING "Failed to mkdir "
                                "/proc/net/hostap\n");
@@ -1109,7 +1110,7 @@ static void __exit hostap_exit(void)
 {
         if (hostap_proc != NULL) {
                 hostap_proc = NULL;
-                remove_proc_entry("hostap", proc_net);
+                remove_proc_entry("hostap", init_net.proc_net);
         }
 }
 
diff --git a/drivers/net/wireless/strip.c b/drivers/net/wireless/strip.c
index ef32a5c1e818..edb214e8c744 100644
--- a/drivers/net/wireless/strip.c
+++ b/drivers/net/wireless/strip.c
@@ -107,6 +107,7 @@ static const char StripVersion[] = "1.3A-STUART.CHESHIRE";
 #include <linux/serialP.h>
 #include <linux/rcupdate.h>
 #include <net/arp.h>
+#include <net/net_namespace.h>
 
 #include <linux/ip.h>
 #include <linux/tcp.h>
@@ -2787,7 +2788,7 @@ static int __init strip_init_driver(void)
         /*
          * Register the status file with /proc
          */
-        proc_net_fops_create("strip", S_IFREG | S_IRUGO, &strip_seq_fops);
+        proc_net_fops_create(&init_net, "strip", S_IFREG | S_IRUGO, &strip_seq_fops);
 
         return status;
 }
@@ -2809,7 +2810,7 @@ static void __exit strip_exit_driver(void)
         }
 
         /* Unregister with the /proc/net file here. */
-        proc_net_remove("strip");
+        proc_net_remove(&init_net, "strip");
 
         if ((i = tty_unregister_ldisc(N_STRIP)))
                 printk(KERN_ERR "STRIP: can't unregister line discipline (err = %d)\n", i);
diff --git a/fs/proc/Makefile b/fs/proc/Makefile
index bce38e3f06cb..ebaba0213546 100644
--- a/fs/proc/Makefile
+++ b/fs/proc/Makefile
@@ -11,6 +11,7 @@ proc-y       += inode.o root.o base.o generic.o array.o \
                 proc_tty.o proc_misc.o
 
 proc-$(CONFIG_PROC_SYSCTL)      += proc_sysctl.o
+proc-$(CONFIG_NET)              += proc_net.o
 proc-$(CONFIG_PROC_KCORE)       += kcore.o
 proc-$(CONFIG_PROC_VMCORE)      += vmcore.o
 proc-$(CONFIG_PROC_DEVICETREE)  += proc_devtree.o
diff --git a/fs/proc/internal.h b/fs/proc/internal.h
index b215c3524fa6..1820eb2ef762 100644
--- a/fs/proc/internal.h
+++ b/fs/proc/internal.h
@@ -16,6 +16,11 @@ extern int proc_sys_init(void);
 #else
 static inline void proc_sys_init(void) { }
 #endif
+#ifdef CONFIG_NET
+extern int proc_net_init(void);
+#else
+static inline int proc_net_init(void) { return 0; }
+#endif
 
 struct vmalloc_info {
         unsigned long   used;
diff --git a/fs/proc/root.c b/fs/proc/root.c
index 41f17037f738..cf3046638b09 100644
--- a/fs/proc/root.c
+++ b/fs/proc/root.c
@@ -21,7 +21,7 @@
 
 #include "internal.h"
 
-struct proc_dir_entry *proc_net, *proc_net_stat, *proc_bus, *proc_root_fs, *proc_root_driver;
+struct proc_dir_entry *proc_bus, *proc_root_fs, *proc_root_driver;
 
 static int proc_get_sb(struct file_system_type *fs_type,
         int flags, const char *dev_name, void *data, struct vfsmount *mnt)
@@ -61,8 +61,8 @@ void __init proc_root_init(void)
                 return;
         }
         proc_misc_init();
-        proc_net = proc_mkdir("net", NULL);
-        proc_net_stat = proc_mkdir("net/stat", NULL);
+
+        proc_net_init();
 
 #ifdef CONFIG_SYSVIPC
         proc_mkdir("sysvipc", NULL);
@@ -159,7 +159,5 @@ EXPORT_SYMBOL(create_proc_entry);
 EXPORT_SYMBOL(remove_proc_entry);
 EXPORT_SYMBOL(proc_root);
 EXPORT_SYMBOL(proc_root_fs);
-EXPORT_SYMBOL(proc_net);
-EXPORT_SYMBOL(proc_net_stat);
 EXPORT_SYMBOL(proc_bus);
 EXPORT_SYMBOL(proc_root_driver);
diff --git a/include/linux/proc_fs.h b/include/linux/proc_fs.h
index cd13a78c5db8..59646705f151 100644
--- a/include/linux/proc_fs.h
+++ b/include/linux/proc_fs.h
@@ -7,6 +7,7 @@
 #include <linux/magic.h>
 #include <asm/atomic.h>
 
+struct net;
 struct completion;
 
 /*
@@ -97,8 +98,6 @@ struct vmcore {
 
 extern struct proc_dir_entry proc_root;
 extern struct proc_dir_entry *proc_root_fs;
-extern struct proc_dir_entry *proc_net;
-extern struct proc_dir_entry *proc_net_stat;
 extern struct proc_dir_entry *proc_bus;
 extern struct proc_dir_entry *proc_root_driver;
 extern struct proc_dir_entry *proc_root_kcore;
@@ -192,36 +191,21 @@ static inline struct proc_dir_entry *create_proc_info_entry(const char *name,
         if (res) res->get_info=get_info;
         return res;
 }
- 
-static inline struct proc_dir_entry *proc_net_create(const char *name,
-        mode_t mode, get_info_t *get_info)
-{
-        return create_proc_info_entry(name,mode,proc_net,get_info);
-}
 
-static inline struct proc_dir_entry *proc_net_fops_create(const char *name,
-        mode_t mode, const struct file_operations *fops)
-{
-        struct proc_dir_entry *res = create_proc_entry(name, mode, proc_net);
-        if (res)
-                res->proc_fops = fops;
-        return res;
-}
-
-static inline void proc_net_remove(const char *name)
-{
-        remove_proc_entry(name,proc_net);
-}
+extern struct proc_dir_entry *proc_net_create(struct net *net,
+        const char *name, mode_t mode, get_info_t *get_info);
+extern struct proc_dir_entry *proc_net_fops_create(struct net *net,
+        const char *name, mode_t mode, const struct file_operations *fops);
+extern void proc_net_remove(struct net *net, const char *name);
 
 #else
 
 #define proc_root_driver NULL
-#define proc_net NULL
 #define proc_bus NULL
 
-#define proc_net_fops_create(name, mode, fops)  ({ (void)(mode), NULL; })
-#define proc_net_create(name, mode, info)       ({ (void)(mode), NULL; })
-static inline void proc_net_remove(const char *name) {}
+#define proc_net_fops_create(net, name, mode, fops)  ({ (void)(mode), NULL; })
+#define proc_net_create(net, name, mode, info)  ({ (void)(mode), NULL; })
+static inline void proc_net_remove(struct net *net, const char *name) {}
 
 static inline void proc_flush_task(struct task_struct *task) { }
 
@@ -281,6 +265,16 @@ static inline struct proc_dir_entry *PDE(const struct inode *inode)
         return PROC_I(inode)->pde;
 }
 
+static inline struct net *PDE_NET(struct proc_dir_entry *pde)
+{
+        return pde->parent->data;
+}
+
+static inline struct net *PROC_NET(const struct inode *inode)
+{
+        return PDE_NET(PDE(inode));
+}
+
 struct proc_maps_private {
         struct pid *pid;
         struct task_struct *task;
diff --git a/include/net/net_namespace.h b/include/net/net_namespace.h
index 6344b77f81a2..547247681345 100644
--- a/include/net/net_namespace.h
+++ b/include/net/net_namespace.h
@@ -8,6 +8,7 @@
 #include <linux/workqueue.h>
 #include <linux/list.h>
 
+struct proc_dir_entry;
 struct net {
         atomic_t                count;          /* To decided when the network
                                                  *  namespace should be freed.
@@ -17,6 +18,10 @@ struct net {
                                                  */
         struct list_head        list;           /* list of network namespaces */
         struct work_struct      work;           /* work struct for freeing */
+
+        struct proc_dir_entry   *proc_net;
+        struct proc_dir_entry   *proc_net_stat;
+        struct proc_dir_entry   *proc_net_root;
 };
 
 extern struct net init_net;
diff --git a/net/802/tr.c b/net/802/tr.c
index e56e61a7f545..032c31e748eb 100644
--- a/net/802/tr.c
+++ b/net/802/tr.c
@@ -36,6 +36,7 @@
 #include <linux/seq_file.h>
 #include <linux/init.h>
 #include <net/arp.h>
+#include <net/net_namespace.h>
 
 static void tr_add_rif_info(struct trh_hdr *trh, struct net_device *dev);
 static void rif_check_expire(unsigned long dummy);
@@ -639,7 +640,7 @@ static int __init rif_init(void)
         rif_timer.function = rif_check_expire;
         add_timer(&rif_timer);
 
-        proc_net_fops_create("tr_rif", S_IRUGO, &rif_seq_fops);
+        proc_net_fops_create(&init_net, "tr_rif", S_IRUGO, &rif_seq_fops);
         return 0;
 }
 
diff --git a/net/8021q/vlanproc.c b/net/8021q/vlanproc.c
index bd08aa090763..ac80e6b9ef53 100644
--- a/net/8021q/vlanproc.c
+++ b/net/8021q/vlanproc.c
@@ -33,6 +33,7 @@
 #include <linux/fs.h>
 #include <linux/netdevice.h>
 #include <linux/if_vlan.h>
+#include <net/net_namespace.h>
 #include "vlanproc.h"
 #include "vlan.h"
 
@@ -143,7 +144,7 @@ void vlan_proc_cleanup(void)
                 remove_proc_entry(name_conf, proc_vlan_dir);
 
         if (proc_vlan_dir)
-                proc_net_remove(name_root);
+                proc_net_remove(&init_net, name_root);
 
         /* Dynamically added entries should be cleaned up as their vlan_device
          * is removed, so we should not have to take care of it here...
@@ -156,7 +157,7 @@ void vlan_proc_cleanup(void)
 
 int __init vlan_proc_init(void)
 {
-        proc_vlan_dir = proc_mkdir(name_root, proc_net);
+        proc_vlan_dir = proc_mkdir(name_root, init_net.proc_net);
         if (proc_vlan_dir) {
                 proc_vlan_conf = create_proc_entry(name_conf,
                                                    S_IFREG|S_IRUSR|S_IWUSR,
diff --git a/net/appletalk/atalk_proc.c b/net/appletalk/atalk_proc.c
index 87a582cc8111..05d9652afcb6 100644
--- a/net/appletalk/atalk_proc.c
+++ b/net/appletalk/atalk_proc.c
@@ -11,6 +11,7 @@
 #include <linux/init.h>
 #include <linux/proc_fs.h>
 #include <linux/seq_file.h>
+#include <net/net_namespace.h>
 #include <net/sock.h>
 #include <linux/atalk.h>
 
@@ -271,7 +272,7 @@ int __init atalk_proc_init(void)
         struct proc_dir_entry *p;
         int rc = -ENOMEM;
 
-        atalk_proc_dir = proc_mkdir("atalk", proc_net);
+        atalk_proc_dir = proc_mkdir("atalk", init_net.proc_net);
         if (!atalk_proc_dir)
                 goto out;
         atalk_proc_dir->owner = THIS_MODULE;
@@ -306,7 +307,7 @@ out_socket:
 out_route:
         remove_proc_entry("interface", atalk_proc_dir);
 out_interface:
-        remove_proc_entry("atalk", proc_net);
+        remove_proc_entry("atalk", init_net.proc_net);
         goto out;
 }
 
@@ -316,5 +317,5 @@ void __exit atalk_proc_exit(void)
         remove_proc_entry("route", atalk_proc_dir);
         remove_proc_entry("socket", atalk_proc_dir);
         remove_proc_entry("arp", atalk_proc_dir);
-        remove_proc_entry("atalk", proc_net);
+        remove_proc_entry("atalk", init_net.proc_net);
 }
diff --git a/net/atm/proc.c b/net/atm/proc.c
index 99fc1fe950ee..3a6be64b0512 100644
--- a/net/atm/proc.c
+++ b/net/atm/proc.c
@@ -22,6 +22,7 @@
 #include <linux/netdevice.h>
 #include <linux/atmclip.h>
 #include <linux/init.h> /* for __init */
+#include <net/net_namespace.h>
 #include <net/atmclip.h>
 #include <asm/uaccess.h>
 #include <asm/atomic.h>
@@ -475,7 +476,7 @@ static void atm_proc_dirs_remove(void)
                 if (e->dirent)
                         remove_proc_entry(e->name, atm_proc_root);
         }
-        remove_proc_entry("net/atm", NULL);
+        remove_proc_entry("atm", init_net.proc_net);
 }
 
 int __init atm_proc_init(void)
@@ -483,7 +484,7 @@ int __init atm_proc_init(void)
         static struct atm_proc_entry *e;
         int ret;
 
-        atm_proc_root = proc_mkdir("net/atm",NULL);
+        atm_proc_root = proc_mkdir("atm", init_net.proc_net);
         if (!atm_proc_root)
                 goto err_out;
         for (e = atm_proc_ents; e->name; e++) {
diff --git a/net/ax25/af_ax25.c b/net/ax25/af_ax25.c
index dae2a42d3d86..1d71f85680b8 100644
--- a/net/ax25/af_ax25.c
+++ b/net/ax25/af_ax25.c
@@ -44,6 +44,7 @@
 #include <linux/sysctl.h>
 #include <linux/init.h>
 #include <linux/spinlock.h>
+#include <net/net_namespace.h>
 #include <net/tcp_states.h>
 #include <net/ip.h>
 #include <net/arp.h>
@@ -1998,9 +1999,9 @@ static int __init ax25_init(void)
         register_netdevice_notifier(&ax25_dev_notifier);
         ax25_register_sysctl();
 
-        proc_net_fops_create("ax25_route", S_IRUGO, &ax25_route_fops);
-        proc_net_fops_create("ax25", S_IRUGO, &ax25_info_fops);
-        proc_net_fops_create("ax25_calls", S_IRUGO, &ax25_uid_fops);
+        proc_net_fops_create(&init_net, "ax25_route", S_IRUGO, &ax25_route_fops);
+        proc_net_fops_create(&init_net, "ax25", S_IRUGO, &ax25_info_fops);
+        proc_net_fops_create(&init_net, "ax25_calls", S_IRUGO, &ax25_uid_fops);
 out:
         return rc;
 }
@@ -2014,9 +2015,9 @@ MODULE_ALIAS_NETPROTO(PF_AX25);
 
 static void __exit ax25_exit(void)
 {
-        proc_net_remove("ax25_route");
-        proc_net_remove("ax25");
-        proc_net_remove("ax25_calls");
+        proc_net_remove(&init_net, "ax25_route");
+        proc_net_remove(&init_net, "ax25");
+        proc_net_remove(&init_net, "ax25_calls");
         ax25_rt_free();
         ax25_uid_free();
         ax25_dev_free();
diff --git a/net/core/dev.c b/net/core/dev.c
index 29cf00c5d865..618fb1c1dd47 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -92,6 +92,7 @@
 #include <linux/etherdevice.h>
 #include <linux/notifier.h>
 #include <linux/skbuff.h>
+#include <net/net_namespace.h>
 #include <net/sock.h>
 #include <linux/rtnetlink.h>
 #include <linux/proc_fs.h>
@@ -2556,24 +2557,24 @@ static int __init dev_proc_init(void)
 {
         int rc = -ENOMEM;
 
-        if (!proc_net_fops_create("dev", S_IRUGO, &dev_seq_fops))
+        if (!proc_net_fops_create(&init_net, "dev", S_IRUGO, &dev_seq_fops))
                 goto out;
-        if (!proc_net_fops_create("softnet_stat", S_IRUGO, &softnet_seq_fops))
+        if (!proc_net_fops_create(&init_net, "softnet_stat", S_IRUGO, &softnet_seq_fops))
                 goto out_dev;
-        if (!proc_net_fops_create("ptype", S_IRUGO, &ptype_seq_fops))
-                goto out_dev2;
+        if (!proc_net_fops_create(&init_net, "ptype", S_IRUGO, &ptype_seq_fops))
+                goto out_softnet;
 
         if (wext_proc_init())
-                goto out_softnet;
+                goto out_ptype;
         rc = 0;
 out:
         return rc;
+out_ptype:
+        proc_net_remove(&init_net, "ptype");
 out_softnet:
-        proc_net_remove("ptype");
-out_dev2:
-        proc_net_remove("softnet_stat");
+        proc_net_remove(&init_net, "softnet_stat");
 out_dev:
-        proc_net_remove("dev");
+        proc_net_remove(&init_net, "dev");
         goto out;
 }
 #else
diff --git a/net/core/dev_mcast.c b/net/core/dev_mcast.c
index 20330c572610..8e069fc207cb 100644
--- a/net/core/dev_mcast.c
+++ b/net/core/dev_mcast.c
@@ -41,6 +41,7 @@
 #include <linux/proc_fs.h>
 #include <linux/seq_file.h>
 #include <linux/init.h>
+#include <net/net_namespace.h>
 #include <net/ip.h>
 #include <net/route.h>
 #include <linux/skbuff.h>
@@ -254,7 +255,7 @@ static const struct file_operations dev_mc_seq_fops = {
 
 void __init dev_mcast_init(void)
 {
-        proc_net_fops_create("dev_mcast", 0, &dev_mc_seq_fops);
+        proc_net_fops_create(&init_net, "dev_mcast", 0, &dev_mc_seq_fops);
 }
 
 EXPORT_SYMBOL(dev_mc_add);
diff --git a/net/core/neighbour.c b/net/core/neighbour.c
index ecd43c4a2221..5f25f4f79b8c 100644
--- a/net/core/neighbour.c
+++ b/net/core/neighbour.c
@@ -25,6 +25,7 @@
 #include <linux/sysctl.h>
 #endif
 #include <linux/times.h>
+#include <net/net_namespace.h>
 #include <net/neighbour.h>
 #include <net/dst.h>
 #include <net/sock.h>
@@ -1350,7 +1351,7 @@ void neigh_table_init_no_netlink(struct neigh_table *tbl)
                 panic("cannot create neighbour cache statistics");
 
 #ifdef CONFIG_PROC_FS
-        tbl->pde = create_proc_entry(tbl->id, 0, proc_net_stat);
+        tbl->pde = create_proc_entry(tbl->id, 0, init_net.proc_net_stat);
         if (!tbl->pde)
                 panic("cannot create neighbour proc dir entry");
         tbl->pde->proc_fops = &neigh_stat_seq_fops;
diff --git a/net/core/pktgen.c b/net/core/pktgen.c
index 84c0edeedf6d..33d7247fb19d 100644
--- a/net/core/pktgen.c
+++ b/net/core/pktgen.c
@@ -152,6 +152,7 @@
 #include <linux/wait.h>
 #include <linux/etherdevice.h>
 #include <linux/kthread.h>
+#include <net/net_namespace.h>
 #include <net/checksum.h>
 #include <net/ipv6.h>
 #include <net/addrconf.h>
@@ -3808,7 +3809,7 @@ static int __init pg_init(void)
 
         printk(KERN_INFO "%s", version);
 
-        pg_proc_dir = proc_mkdir(PG_PROC_DIR, proc_net);
+        pg_proc_dir = proc_mkdir(PG_PROC_DIR, init_net.proc_net);
         if (!pg_proc_dir)
                 return -ENODEV;
         pg_proc_dir->owner = THIS_MODULE;
@@ -3817,7 +3818,7 @@ static int __init pg_init(void)
         if (pe == NULL) {
                 printk(KERN_ERR "pktgen: ERROR: cannot create %s "
                        "procfs entry.\n", PGCTRL);
-                proc_net_remove(PG_PROC_DIR);
+                proc_net_remove(&init_net, PG_PROC_DIR);
                 return -EINVAL;
         }
 
@@ -3841,7 +3842,7 @@ static int __init pg_init(void)
                        "all threads\n");
                 unregister_netdevice_notifier(&pktgen_notifier_block);
                 remove_proc_entry(PGCTRL, pg_proc_dir);
-                proc_net_remove(PG_PROC_DIR);
+                proc_net_remove(&init_net, PG_PROC_DIR);
                 return -ENODEV;
         }
 
@@ -3868,7 +3869,7 @@ static void __exit pg_cleanup(void)
 
         /* Clean up proc file system */
         remove_proc_entry(PGCTRL, pg_proc_dir);
-        proc_net_remove(PG_PROC_DIR);
+        proc_net_remove(&init_net, PG_PROC_DIR);
 }
 
 module_init(pg_init);
diff --git a/net/core/sock.c b/net/core/sock.c
index beb924c248e8..bbc726a49d87 100644
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -119,6 +119,7 @@
 #include <linux/netdevice.h>
 #include <net/protocol.h>
 #include <linux/skbuff.h>
+#include <net/net_namespace.h>
 #include <net/request_sock.h>
 #include <net/sock.h>
 #include <net/xfrm.h>
@@ -1973,7 +1974,7 @@ static const struct file_operations proto_seq_fops = {
 static int __init proto_init(void)
 {
         /* register /proc/net/protocols */
-        return proc_net_fops_create("protocols", S_IRUGO, &proto_seq_fops) == NULL ? -ENOBUFS : 0;
+        return proc_net_fops_create(&init_net, "protocols", S_IRUGO, &proto_seq_fops) == NULL ? -ENOBUFS : 0;
 }
 
 subsys_initcall(proto_init);
diff --git a/net/dccp/probe.c b/net/dccp/probe.c
index bae10b0f2fc3..7053bb827bc8 100644
--- a/net/dccp/probe.c
+++ b/net/dccp/probe.c
@@ -30,6 +30,7 @@
 #include <linux/module.h>
 #include <linux/kfifo.h>
 #include <linux/vmalloc.h>
+#include <net/net_namespace.h>
 
 #include "dccp.h"
 #include "ccid.h"
@@ -168,7 +169,7 @@ static __init int dccpprobe_init(void)
         if (IS_ERR(dccpw.fifo))
                 return PTR_ERR(dccpw.fifo);
 
-        if (!proc_net_fops_create(procname, S_IRUSR, &dccpprobe_fops))
+        if (!proc_net_fops_create(&init_net, procname, S_IRUSR, &dccpprobe_fops))
                 goto err0;
 
         ret = register_jprobe(&dccp_send_probe);
@@ -178,7 +179,7 @@ static __init int dccpprobe_init(void)
         pr_info("DCCP watch registered (port=%d)\n", port);
         return 0;
 err1:
-        proc_net_remove(procname);
+        proc_net_remove(&init_net, procname);
 err0:
         kfifo_free(dccpw.fifo);
         return ret;
@@ -188,7 +189,7 @@ module_init(dccpprobe_init);
 static __exit void dccpprobe_exit(void)
 {
         kfifo_free(dccpw.fifo);
-        proc_net_remove(procname);
+        proc_net_remove(&init_net, procname);
         unregister_jprobe(&dccp_send_probe);
 
 }
diff --git a/net/decnet/af_decnet.c b/net/decnet/af_decnet.c
index ed76d4aab4a9..625d5955b8e2 100644
--- a/net/decnet/af_decnet.c
+++ b/net/decnet/af_decnet.c
@@ -128,6 +128,7 @@ Version 0.0.6    2.1.110   07-aug-98   Eduardo Marcelo Serrat
 #include <linux/stat.h>
 #include <linux/init.h>
 #include <linux/poll.h>
+#include <net/net_namespace.h>
 #include <net/neighbour.h>
 #include <net/dst.h>
 #include <net/fib_rules.h>
@@ -2399,7 +2400,7 @@ static int __init decnet_init(void)
         dev_add_pack(&dn_dix_packet_type);
         register_netdevice_notifier(&dn_dev_notifier);
 
-        proc_net_fops_create("decnet", S_IRUGO, &dn_socket_seq_fops);
+        proc_net_fops_create(&init_net, "decnet", S_IRUGO, &dn_socket_seq_fops);
         dn_register_sysctl();
 out:
         return rc;
@@ -2428,7 +2429,7 @@ static void __exit decnet_exit(void)
         dn_neigh_cleanup();
         dn_fib_cleanup();
 
-        proc_net_remove("decnet");
+        proc_net_remove(&init_net, "decnet");
 
         proto_unregister(&dn_proto);
 }
diff --git a/net/decnet/dn_dev.c b/net/decnet/dn_dev.c
index 8def68209edd..83cb0761336a 100644
--- a/net/decnet/dn_dev.c
+++ b/net/decnet/dn_dev.c
@@ -42,6 +42,7 @@
 #include <linux/notifier.h>
 #include <asm/uaccess.h>
 #include <asm/system.h>
+#include <net/net_namespace.h>
 #include <net/neighbour.h>
 #include <net/dst.h>
 #include <net/flow.h>
@@ -1462,7 +1463,7 @@ void __init dn_dev_init(void)
         rtnl_register(PF_DECnet, RTM_DELADDR, dn_nl_deladdr, NULL);
         rtnl_register(PF_DECnet, RTM_GETADDR, NULL, dn_nl_dump_ifaddr);
 
-        proc_net_fops_create("decnet_dev", S_IRUGO, &dn_dev_seq_fops);
+        proc_net_fops_create(&init_net, "decnet_dev", S_IRUGO, &dn_dev_seq_fops);
 
 #ifdef CONFIG_SYSCTL
         {
@@ -1483,7 +1484,7 @@ void __exit dn_dev_cleanup(void)
         }
 #endif /* CONFIG_SYSCTL */
 
-        proc_net_remove("decnet_dev");
+        proc_net_remove(&init_net, "decnet_dev");
 
         dn_dev_devices_off();
 }
diff --git a/net/decnet/dn_neigh.c b/net/decnet/dn_neigh.c
index 174d8a7a6dac..a424a8ddbaf7 100644
--- a/net/decnet/dn_neigh.c
+++ b/net/decnet/dn_neigh.c
@@ -38,6 +38,7 @@
 #include <linux/rcupdate.h>
 #include <linux/jhash.h>
 #include <asm/atomic.h>
+#include <net/net_namespace.h>
 #include <net/neighbour.h>
 #include <net/dst.h>
 #include <net/flow.h>
@@ -611,11 +612,11 @@ static const struct file_operations dn_neigh_seq_fops = {
 void __init dn_neigh_init(void)
 {
         neigh_table_init(&dn_neigh_table);
-        proc_net_fops_create("decnet_neigh", S_IRUGO, &dn_neigh_seq_fops);
+        proc_net_fops_create(&init_net, "decnet_neigh", S_IRUGO, &dn_neigh_seq_fops);
 }
 
 void __exit dn_neigh_cleanup(void)
 {
-        proc_net_remove("decnet_neigh");
+        proc_net_remove(&init_net, "decnet_neigh");
         neigh_table_clear(&dn_neigh_table);
 }
diff --git a/net/decnet/dn_route.c b/net/decnet/dn_route.c
index a4a620971ef0..4cfea9563d2a 100644
--- a/net/decnet/dn_route.c
+++ b/net/decnet/dn_route.c
@@ -77,6 +77,7 @@
 #include <linux/rcupdate.h>
 #include <linux/times.h>
 #include <asm/errno.h>
+#include <net/net_namespace.h>
 #include <net/netlink.h>
 #include <net/neighbour.h>
 #include <net/dst.h>
@@ -1814,7 +1815,7 @@ void __init dn_route_init(void)
 
         dn_dst_ops.gc_thresh = (dn_rt_hash_mask + 1);
 
-        proc_net_fops_create("decnet_cache", S_IRUGO, &dn_rt_cache_seq_fops);
+        proc_net_fops_create(&init_net, "decnet_cache", S_IRUGO, &dn_rt_cache_seq_fops);
 
 #ifdef CONFIG_DECNET_ROUTER
         rtnl_register(PF_DECnet, RTM_GETROUTE, dn_cache_getroute, dn_fib_dump);
@@ -1829,6 +1830,6 @@ void __exit dn_route_cleanup(void)
         del_timer(&dn_route_timer);
         dn_run_flush(0);
 
-        proc_net_remove("decnet_cache");
+        proc_net_remove(&init_net, "decnet_cache");
 }
 
diff --git a/net/ieee80211/ieee80211_module.c b/net/ieee80211/ieee80211_module.c
index 17ad278696ed..69cb6aad25be 100644
--- a/net/ieee80211/ieee80211_module.c
+++ b/net/ieee80211/ieee80211_module.c
@@ -47,6 +47,7 @@
 #include <linux/wireless.h>
 #include <linux/etherdevice.h>
 #include <asm/uaccess.h>
+#include <net/net_namespace.h>
 #include <net/arp.h>
 
 #include <net/ieee80211.h>
@@ -264,7 +265,7 @@ static int __init ieee80211_init(void)
         struct proc_dir_entry *e;
 
         ieee80211_debug_level = debug;
-        ieee80211_proc = proc_mkdir(DRV_NAME, proc_net);
+        ieee80211_proc = proc_mkdir(DRV_NAME, init_net.proc_net);
         if (ieee80211_proc == NULL) {
                 IEEE80211_ERROR("Unable to create " DRV_NAME
                                 " proc directory\n");
@@ -273,7 +274,7 @@ static int __init ieee80211_init(void)
         e = create_proc_entry("debug_level", S_IFREG | S_IRUGO | S_IWUSR,
                               ieee80211_proc);
         if (!e) {
-                remove_proc_entry(DRV_NAME, proc_net);
+                remove_proc_entry(DRV_NAME, init_net.proc_net);
                 ieee80211_proc = NULL;
                 return -EIO;
         }
@@ -293,7 +294,7 @@ static void __exit ieee80211_exit(void)
 #ifdef CONFIG_IEEE80211_DEBUG
         if (ieee80211_proc) {
                 remove_proc_entry("debug_level", ieee80211_proc);
-                remove_proc_entry(DRV_NAME, proc_net);
+                remove_proc_entry(DRV_NAME, init_net.proc_net);
                 ieee80211_proc = NULL;
         }
 #endif                          /* CONFIG_IEEE80211_DEBUG */
diff --git a/net/ipv4/arp.c b/net/ipv4/arp.c
index 9ab9d534fbac..78dd3443016c 100644
--- a/net/ipv4/arp.c
+++ b/net/ipv4/arp.c
@@ -103,6 +103,7 @@
 #include <linux/sysctl.h>
 #endif
 
+#include <net/net_namespace.h>
 #include <net/ip.h>
 #include <net/icmp.h>
 #include <net/route.h>
@@ -1400,7 +1401,7 @@ static const struct file_operations arp_seq_fops = {
 
 static int __init arp_proc_init(void)
 {
-        if (!proc_net_fops_create("arp", S_IRUGO, &arp_seq_fops))
+        if (!proc_net_fops_create(&init_net, "arp", S_IRUGO, &arp_seq_fops))
                 return -ENOMEM;
         return 0;
 }
diff --git a/net/ipv4/fib_hash.c b/net/ipv4/fib_hash.c
index 9ad1d9ff9ce7..9fafbeea8fe6 100644
--- a/net/ipv4/fib_hash.c
+++ b/net/ipv4/fib_hash.c
@@ -35,6 +35,7 @@
 #include <linux/netlink.h>
 #include <linux/init.h>
 
+#include <net/net_namespace.h>
 #include <net/ip.h>
 #include <net/protocol.h>
 #include <net/route.h>
@@ -1068,13 +1069,13 @@ static const struct file_operations fib_seq_fops = {
 
 int __init fib_proc_init(void)
 {
-        if (!proc_net_fops_create("route", S_IRUGO, &fib_seq_fops))
+        if (!proc_net_fops_create(&init_net, "route", S_IRUGO, &fib_seq_fops))
                 return -ENOMEM;
         return 0;
 }
 
 void __init fib_proc_exit(void)
 {
-        proc_net_remove("route");
+        proc_net_remove(&init_net, "route");
 }
 #endif /* CONFIG_PROC_FS */
diff --git a/net/ipv4/fib_trie.c b/net/ipv4/fib_trie.c
index 52b2891c63b7..be34bd556d58 100644
--- a/net/ipv4/fib_trie.c
+++ b/net/ipv4/fib_trie.c
@@ -73,6 +73,7 @@
 #include <linux/netlink.h>
 #include <linux/init.h>
 #include <linux/list.h>
+#include <net/net_namespace.h>
 #include <net/ip.h>
 #include <net/protocol.h>
 #include <net/route.h>
@@ -2530,30 +2531,30 @@ static const struct file_operations fib_route_fops = {
 
 int __init fib_proc_init(void)
 {
-        if (!proc_net_fops_create("fib_trie", S_IRUGO, &fib_trie_fops))
+        if (!proc_net_fops_create(&init_net, "fib_trie", S_IRUGO, &fib_trie_fops))
                 goto out1;
 
-        if (!proc_net_fops_create("fib_triestat", S_IRUGO, &fib_triestat_fops))
+        if (!proc_net_fops_create(&init_net, "fib_triestat", S_IRUGO, &fib_triestat_fops))
                 goto out2;
 
-        if (!proc_net_fops_create("route", S_IRUGO, &fib_route_fops))
+        if (!proc_net_fops_create(&init_net, "route", S_IRUGO, &fib_route_fops))
                 goto out3;
 
         return 0;
 
 out3:
-        proc_net_remove("fib_triestat");
+        proc_net_remove(&init_net, "fib_triestat");
 out2:
-        proc_net_remove("fib_trie");
+        proc_net_remove(&init_net, "fib_trie");
 out1:
         return -ENOMEM;
 }
 
 void __init fib_proc_exit(void)
 {
-        proc_net_remove("fib_trie");
-        proc_net_remove("fib_triestat");
-        proc_net_remove("route");
+        proc_net_remove(&init_net, "fib_trie");
+        proc_net_remove(&init_net, "fib_triestat");
+        proc_net_remove(&init_net, "route");
 }
 
 #endif /* CONFIG_PROC_FS */
diff --git a/net/ipv4/igmp.c b/net/ipv4/igmp.c
index a646409c2d06..d78599a9dbd5 100644
--- a/net/ipv4/igmp.c
+++ b/net/ipv4/igmp.c
@@ -91,6 +91,7 @@
 #include <linux/rtnetlink.h>
 #include <linux/times.h>
 
+#include <net/net_namespace.h>
 #include <net/arp.h>
 #include <net/ip.h>
 #include <net/protocol.h>
@@ -2613,8 +2614,8 @@ static const struct file_operations igmp_mcf_seq_fops = {
 
 int __init igmp_mc_proc_init(void)
 {
-        proc_net_fops_create("igmp", S_IRUGO, &igmp_mc_seq_fops);
-        proc_net_fops_create("mcfilter", S_IRUGO, &igmp_mcf_seq_fops);
+        proc_net_fops_create(&init_net, "igmp", S_IRUGO, &igmp_mc_seq_fops);
+        proc_net_fops_create(&init_net, "mcfilter", S_IRUGO, &igmp_mcf_seq_fops);
         return 0;
 }
 #endif
diff --git a/net/ipv4/ipconfig.c b/net/ipv4/ipconfig.c
index c5b247077539..5ae4849878a3 100644
--- a/net/ipv4/ipconfig.c
+++ b/net/ipv4/ipconfig.c
@@ -55,6 +55,7 @@
 #include <linux/root_dev.h>
 #include <linux/delay.h>
 #include <linux/nfs_fs.h>
+#include <net/net_namespace.h>
 #include <net/arp.h>
 #include <net/ip.h>
 #include <net/ipconfig.h>
@@ -1253,7 +1254,7 @@ static int __init ip_auto_config(void)
         __be32 addr;
 
 #ifdef CONFIG_PROC_FS
-        proc_net_fops_create("pnp", S_IRUGO, &pnp_seq_fops);
+        proc_net_fops_create(&init_net, "pnp", S_IRUGO, &pnp_seq_fops);
 #endif /* CONFIG_PROC_FS */
 
         if (!ic_enable)
diff --git a/net/ipv4/ipmr.c b/net/ipv4/ipmr.c
index 7003cc1b7fe2..35683e1a42e8 100644
--- a/net/ipv4/ipmr.c
+++ b/net/ipv4/ipmr.c
@@ -49,6 +49,7 @@
 #include <linux/mroute.h>
 #include <linux/init.h>
 #include <linux/if_ether.h>
+#include <net/net_namespace.h>
 #include <net/ip.h>
 #include <net/protocol.h>
 #include <linux/skbuff.h>
@@ -1922,7 +1923,7 @@ void __init ip_mr_init(void)
         ipmr_expire_timer.function=ipmr_expire_process;
         register_netdevice_notifier(&ip_mr_notifier);
 #ifdef CONFIG_PROC_FS
-        proc_net_fops_create("ip_mr_vif", 0, &ipmr_vif_fops);
-        proc_net_fops_create("ip_mr_cache", 0, &ipmr_mfc_fops);
+        proc_net_fops_create(&init_net, "ip_mr_vif", 0, &ipmr_vif_fops);
+        proc_net_fops_create(&init_net, "ip_mr_cache", 0, &ipmr_mfc_fops);
 #endif
 }
diff --git a/net/ipv4/ipvs/ip_vs_app.c b/net/ipv4/ipvs/ip_vs_app.c
index 8d6901d4e94f..341474eefa55 100644
--- a/net/ipv4/ipvs/ip_vs_app.c
+++ b/net/ipv4/ipvs/ip_vs_app.c
@@ -25,6 +25,7 @@
 #include <linux/skbuff.h>
 #include <linux/in.h>
 #include <linux/ip.h>
+#include <net/net_namespace.h>
 #include <net/protocol.h>
 #include <net/tcp.h>
 #include <asm/system.h>
@@ -616,12 +617,12 @@ int ip_vs_skb_replace(struct sk_buff *skb, gfp_t pri,
 int ip_vs_app_init(void)
 {
         /* we will replace it with proc_net_ipvs_create() soon */
-        proc_net_fops_create("ip_vs_app", 0, &ip_vs_app_fops);
+        proc_net_fops_create(&init_net, "ip_vs_app", 0, &ip_vs_app_fops);
         return 0;
 }
 
 
 void ip_vs_app_cleanup(void)
 {
-        proc_net_remove("ip_vs_app");
+        proc_net_remove(&init_net, "ip_vs_app");
 }
diff --git a/net/ipv4/ipvs/ip_vs_conn.c b/net/ipv4/ipvs/ip_vs_conn.c
index d612a6a5d957..4b702f708d30 100644
--- a/net/ipv4/ipvs/ip_vs_conn.c
+++ b/net/ipv4/ipvs/ip_vs_conn.c
@@ -35,6 +35,7 @@
 #include <linux/jhash.h>
 #include <linux/random.h>
 
+#include <net/net_namespace.h>
 #include <net/ip_vs.h>
 
 
@@ -922,7 +923,7 @@ int ip_vs_conn_init(void)
                 rwlock_init(&__ip_vs_conntbl_lock_array[idx].l);
         }
 
-        proc_net_fops_create("ip_vs_conn", 0, &ip_vs_conn_fops);
+        proc_net_fops_create(&init_net, "ip_vs_conn", 0, &ip_vs_conn_fops);
 
         /* calculate the random value for connection hash */
         get_random_bytes(&ip_vs_conn_rnd, sizeof(ip_vs_conn_rnd));
@@ -938,6 +939,6 @@ void ip_vs_conn_cleanup(void)
 
         /* Release the empty cache */
         kmem_cache_destroy(ip_vs_conn_cachep);
-        proc_net_remove("ip_vs_conn");
+        proc_net_remove(&init_net, "ip_vs_conn");
         vfree(ip_vs_conn_tab);
 }
diff --git a/net/ipv4/ipvs/ip_vs_ctl.c b/net/ipv4/ipvs/ip_vs_ctl.c
index f656d41d8d41..61d023d58b5d 100644
--- a/net/ipv4/ipvs/ip_vs_ctl.c
+++ b/net/ipv4/ipvs/ip_vs_ctl.c
@@ -35,6 +35,7 @@
 #include <linux/netfilter_ipv4.h>
 #include <linux/mutex.h>
 
+#include <net/net_namespace.h>
 #include <net/ip.h>
 #include <net/route.h>
 #include <net/sock.h>
@@ -2356,8 +2357,8 @@ int ip_vs_control_init(void)
                 return ret;
         }
 
-        proc_net_fops_create("ip_vs", 0, &ip_vs_info_fops);
-        proc_net_fops_create("ip_vs_stats",0, &ip_vs_stats_fops);
+        proc_net_fops_create(&init_net, "ip_vs", 0, &ip_vs_info_fops);
+        proc_net_fops_create(&init_net, "ip_vs_stats",0, &ip_vs_stats_fops);
 
         sysctl_header = register_sysctl_table(vs_root_table);
 
@@ -2390,8 +2391,8 @@ void ip_vs_control_cleanup(void)
         cancel_work_sync(&defense_work.work);
         ip_vs_kill_estimator(&ip_vs_stats);
         unregister_sysctl_table(sysctl_header);
-        proc_net_remove("ip_vs_stats");
-        proc_net_remove("ip_vs");
+        proc_net_remove(&init_net, "ip_vs_stats");
+        proc_net_remove(&init_net, "ip_vs");
         nf_unregister_sockopt(&ip_vs_sockopts);
         LeaveFunction(2);
 }
diff --git a/net/ipv4/ipvs/ip_vs_lblcr.c b/net/ipv4/ipvs/ip_vs_lblcr.c
index 6225acac7a3b..6a1fec416eaf 100644
--- a/net/ipv4/ipvs/ip_vs_lblcr.c
+++ b/net/ipv4/ipvs/ip_vs_lblcr.c
@@ -50,6 +50,7 @@
 #include <linux/sysctl.h>
 /* for proc_net_create/proc_net_remove */
 #include <linux/proc_fs.h>
+#include <net/net_namespace.h>
 
 #include <net/ip_vs.h>
 
@@ -843,7 +844,7 @@ static int __init ip_vs_lblcr_init(void)
         INIT_LIST_HEAD(&ip_vs_lblcr_scheduler.n_list);
         sysctl_header = register_sysctl_table(lblcr_root_table);
 #ifdef CONFIG_IP_VS_LBLCR_DEBUG
-        proc_net_create("ip_vs_lblcr", 0, ip_vs_lblcr_getinfo);
+        proc_net_create(&init_net, "ip_vs_lblcr", 0, ip_vs_lblcr_getinfo);
 #endif
         return register_ip_vs_scheduler(&ip_vs_lblcr_scheduler);
 }
@@ -852,7 +853,7 @@ static int __init ip_vs_lblcr_init(void)
 static void __exit ip_vs_lblcr_cleanup(void)
 {
 #ifdef CONFIG_IP_VS_LBLCR_DEBUG
-        proc_net_remove("ip_vs_lblcr");
+        proc_net_remove(&init_net, "ip_vs_lblcr");
 #endif
         unregister_sysctl_table(sysctl_header);
         unregister_ip_vs_scheduler(&ip_vs_lblcr_scheduler);
diff --git a/net/ipv4/netfilter/ip_queue.c b/net/ipv4/netfilter/ip_queue.c
index 702d94db19b9..cb5e61a1d7ab 100644
--- a/net/ipv4/netfilter/ip_queue.c
+++ b/net/ipv4/netfilter/ip_queue.c
@@ -24,6 +24,7 @@
 #include <linux/proc_fs.h>
 #include <linux/security.h>
 #include <linux/mutex.h>
+#include <net/net_namespace.h>
 #include <net/sock.h>
 #include <net/route.h>
 
@@ -674,7 +675,7 @@ static int __init ip_queue_init(void)
                 goto cleanup_netlink_notifier;
         }
 
-        proc = proc_net_create(IPQ_PROC_FS_NAME, 0, ipq_get_info);
+        proc = proc_net_create(&init_net, IPQ_PROC_FS_NAME, 0, ipq_get_info);
         if (proc)
                 proc->owner = THIS_MODULE;
         else {
@@ -695,8 +696,7 @@ static int __init ip_queue_init(void)
 cleanup_sysctl:
         unregister_sysctl_table(ipq_sysctl_header);
         unregister_netdevice_notifier(&ipq_dev_notifier);
-        proc_net_remove(IPQ_PROC_FS_NAME);
-
+        proc_net_remove(&init_net, IPQ_PROC_FS_NAME);
 cleanup_ipqnl:
         sock_release(ipqnl->sk_socket);
         mutex_lock(&ipqnl_mutex);
@@ -715,7 +715,7 @@ static void __exit ip_queue_fini(void)
 
         unregister_sysctl_table(ipq_sysctl_header);
         unregister_netdevice_notifier(&ipq_dev_notifier);
-        proc_net_remove(IPQ_PROC_FS_NAME);
+        proc_net_remove(&init_net, IPQ_PROC_FS_NAME);
 
         sock_release(ipqnl->sk_socket);
         mutex_lock(&ipqnl_mutex);
diff --git a/net/ipv4/netfilter/ipt_CLUSTERIP.c b/net/ipv4/netfilter/ipt_CLUSTERIP.c
index 69bd362b5fa2..50fc9e009fe4 100644
--- a/net/ipv4/netfilter/ipt_CLUSTERIP.c
+++ b/net/ipv4/netfilter/ipt_CLUSTERIP.c
@@ -25,6 +25,7 @@
 #include <linux/netfilter_ipv4/ip_tables.h>
 #include <linux/netfilter_ipv4/ipt_CLUSTERIP.h>
 #include <net/netfilter/nf_conntrack.h>
+#include <net/net_namespace.h>
 #include <net/checksum.h>
 
 #define CLUSTERIP_VERSION "0.8"
@@ -726,7 +727,7 @@ static int __init ipt_clusterip_init(void)
                 goto cleanup_target;
 
 #ifdef CONFIG_PROC_FS
-        clusterip_procdir = proc_mkdir("ipt_CLUSTERIP", proc_net);
+        clusterip_procdir = proc_mkdir("ipt_CLUSTERIP", init_net.proc_net);
         if (!clusterip_procdir) {
                 printk(KERN_ERR "CLUSTERIP: Unable to proc dir entry\n");
                 ret = -ENOMEM;
diff --git a/net/ipv4/netfilter/ipt_recent.c b/net/ipv4/netfilter/ipt_recent.c
index 6d0c0f7364ad..db2a79889f9a 100644
--- a/net/ipv4/netfilter/ipt_recent.c
+++ b/net/ipv4/netfilter/ipt_recent.c
@@ -24,6 +24,7 @@
 #include <linux/bitops.h>
 #include <linux/skbuff.h>
 #include <linux/inet.h>
+#include <net/net_namespace.h>
 
 #include <linux/netfilter/x_tables.h>
 #include <linux/netfilter_ipv4/ipt_recent.h>
@@ -487,7 +488,7 @@ static int __init ipt_recent_init(void)
 #ifdef CONFIG_PROC_FS
         if (err)
                 return err;
-        proc_dir = proc_mkdir("ipt_recent", proc_net);
+        proc_dir = proc_mkdir("ipt_recent", init_net.proc_net);
         if (proc_dir == NULL) {
                 xt_unregister_match(&recent_match);
                 err = -ENOMEM;
@@ -501,7 +502,7 @@ static void __exit ipt_recent_exit(void)
         BUG_ON(!list_empty(&tables));
         xt_unregister_match(&recent_match);
 #ifdef CONFIG_PROC_FS
-        remove_proc_entry("ipt_recent", proc_net);
+        remove_proc_entry("ipt_recent", init_net.proc_net);
 #endif
 }
 
diff --git a/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4_compat.c b/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4_compat.c
index b3dd5de9a258..a5ae2eabf0f3 100644
--- a/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4_compat.c
+++ b/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4_compat.c
@@ -11,6 +11,7 @@
 #include <linux/proc_fs.h>
 #include <linux/seq_file.h>
 #include <linux/percpu.h>
+#include <net/net_namespace.h>
 
 #include <linux/netfilter.h>
 #include <net/netfilter/nf_conntrack_core.h>
@@ -408,16 +409,16 @@ int __init nf_conntrack_ipv4_compat_init(void)
 {
         struct proc_dir_entry *proc, *proc_exp, *proc_stat;
 
-        proc = proc_net_fops_create("ip_conntrack", 0440, &ct_file_ops);
+        proc = proc_net_fops_create(&init_net, "ip_conntrack", 0440, &ct_file_ops);
         if (!proc)
                 goto err1;
 
-        proc_exp = proc_net_fops_create("ip_conntrack_expect", 0440,
+        proc_exp = proc_net_fops_create(&init_net, "ip_conntrack_expect", 0440,
                                         &ip_exp_file_ops);
         if (!proc_exp)
                 goto err2;
 
-        proc_stat = create_proc_entry("ip_conntrack", S_IRUGO, proc_net_stat);
+        proc_stat = create_proc_entry("ip_conntrack", S_IRUGO, init_net.proc_net_stat);
         if (!proc_stat)
                 goto err3;
 
@@ -427,16 +428,16 @@ int __init nf_conntrack_ipv4_compat_init(void)
         return 0;
 
 err3:
-        proc_net_remove("ip_conntrack_expect");
+        proc_net_remove(&init_net, "ip_conntrack_expect");
 err2:
-        proc_net_remove("ip_conntrack");
+        proc_net_remove(&init_net, "ip_conntrack");
 err1:
         return -ENOMEM;
 }
 
 void __exit nf_conntrack_ipv4_compat_fini(void)
 {
-        remove_proc_entry("ip_conntrack", proc_net_stat);
-        proc_net_remove("ip_conntrack_expect");
-        proc_net_remove("ip_conntrack");
+        remove_proc_entry("ip_conntrack", init_net.proc_net_stat);
+        proc_net_remove(&init_net, "ip_conntrack_expect");
+        proc_net_remove(&init_net, "ip_conntrack");
 }
diff --git a/net/ipv4/proc.c b/net/ipv4/proc.c
index 986d1c83a000..95a8f8f2de71 100644
--- a/net/ipv4/proc.c
+++ b/net/ipv4/proc.c
@@ -34,6 +34,7 @@
  *              2 of the License, or (at your option) any later version.
  */
 #include <linux/types.h>
+#include <net/net_namespace.h>
 #include <net/icmp.h>
 #include <net/protocol.h>
 #include <net/tcp.h>
@@ -383,20 +384,20 @@ int __init ip_misc_proc_init(void)
 {
         int rc = 0;
 
-        if (!proc_net_fops_create("netstat", S_IRUGO, &netstat_seq_fops))
+        if (!proc_net_fops_create(&init_net, "netstat", S_IRUGO, &netstat_seq_fops))
                 goto out_netstat;
 
-        if (!proc_net_fops_create("snmp", S_IRUGO, &snmp_seq_fops))
+        if (!proc_net_fops_create(&init_net, "snmp", S_IRUGO, &snmp_seq_fops))
                 goto out_snmp;
 
-        if (!proc_net_fops_create("sockstat", S_IRUGO, &sockstat_seq_fops))
+        if (!proc_net_fops_create(&init_net, "sockstat", S_IRUGO, &sockstat_seq_fops))
                 goto out_sockstat;
 out:
         return rc;
 out_sockstat:
-        proc_net_remove("snmp");
+        proc_net_remove(&init_net, "snmp");
 out_snmp:
-        proc_net_remove("netstat");
+        proc_net_remove(&init_net, "netstat");
 out_netstat:
         rc = -ENOMEM;
         goto out;
diff --git a/net/ipv4/raw.c b/net/ipv4/raw.c
index c6d71526f625..216e01b0f44a 100644
--- a/net/ipv4/raw.c
+++ b/net/ipv4/raw.c
@@ -59,6 +59,7 @@
 #include <linux/in_route.h>
 #include <linux/route.h>
 #include <linux/skbuff.h>
+#include <net/net_namespace.h>
 #include <net/dst.h>
 #include <net/sock.h>
 #include <linux/gfp.h>
@@ -928,13 +929,13 @@ static const struct file_operations raw_seq_fops = {
 
 int __init raw_proc_init(void)
 {
-        if (!proc_net_fops_create("raw", S_IRUGO, &raw_seq_fops))
+        if (!proc_net_fops_create(&init_net, "raw", S_IRUGO, &raw_seq_fops))
                 return -ENOMEM;
         return 0;
 }
 
 void __init raw_proc_exit(void)
 {
-        proc_net_remove("raw");
+        proc_net_remove(&init_net, "raw");
 }
 #endif /* CONFIG_PROC_FS */
diff --git a/net/ipv4/route.c b/net/ipv4/route.c
index c7ca94bd152c..efd2a9202d68 100644
--- a/net/ipv4/route.c
+++ b/net/ipv4/route.c
@@ -91,6 +91,7 @@
 #include <linux/jhash.h>
 #include <linux/rcupdate.h>
 #include <linux/times.h>
+#include <net/net_namespace.h>
 #include <net/protocol.h>
 #include <net/ip.h>
 #include <net/route.h>
@@ -3011,15 +3012,15 @@ int __init ip_rt_init(void)
 #ifdef CONFIG_PROC_FS
         {
         struct proc_dir_entry *rtstat_pde = NULL; /* keep gcc happy */
-        if (!proc_net_fops_create("rt_cache", S_IRUGO, &rt_cache_seq_fops) ||
+        if (!proc_net_fops_create(&init_net, "rt_cache", S_IRUGO, &rt_cache_seq_fops) ||
             !(rtstat_pde = create_proc_entry("rt_cache", S_IRUGO,
-                                             proc_net_stat))) {
+                                             init_net.proc_net_stat))) {
                 return -ENOMEM;
         }
         rtstat_pde->proc_fops = &rt_cpu_seq_fops;
         }
 #ifdef CONFIG_NET_CLS_ROUTE
-        create_proc_read_entry("rt_acct", 0, proc_net, ip_rt_acct_read, NULL);
+        create_proc_read_entry("rt_acct", 0, init_net.proc_net, ip_rt_acct_read, NULL);
 #endif
 #endif
 #ifdef CONFIG_XFRM
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
index e089a978e128..8855e640e958 100644
--- a/net/ipv4/tcp_ipv4.c
+++ b/net/ipv4/tcp_ipv4.c
@@ -62,6 +62,7 @@
 #include <linux/init.h>
 #include <linux/times.h>
 
+#include <net/net_namespace.h>
 #include <net/icmp.h>
 #include <net/inet_hashtables.h>
 #include <net/tcp.h>
@@ -2249,7 +2250,7 @@ int tcp_proc_register(struct tcp_seq_afinfo *afinfo)
         afinfo->seq_fops->llseek        = seq_lseek;
         afinfo->seq_fops->release       = seq_release_private;
 
-        p = proc_net_fops_create(afinfo->name, S_IRUGO, afinfo->seq_fops);
+        p = proc_net_fops_create(&init_net, afinfo->name, S_IRUGO, afinfo->seq_fops);
         if (p)
                 p->data = afinfo;
         else
@@ -2261,7 +2262,7 @@ void tcp_proc_unregister(struct tcp_seq_afinfo *afinfo)
 {
         if (!afinfo)
                 return;
-        proc_net_remove(afinfo->name);
+        proc_net_remove(&init_net, afinfo->name);
         memset(afinfo->seq_fops, 0, sizeof(*afinfo->seq_fops));
 }
 
diff --git a/net/ipv4/tcp_probe.c b/net/ipv4/tcp_probe.c
index b76398d1b454..87dd5bff315f 100644
--- a/net/ipv4/tcp_probe.c
+++ b/net/ipv4/tcp_probe.c
@@ -26,6 +26,7 @@
 #include <linux/module.h>
 #include <linux/ktime.h>
 #include <linux/time.h>
+#include <net/net_namespace.h>
 
 #include <net/tcp.h>
 
@@ -228,7 +229,7 @@ static __init int tcpprobe_init(void)
         if (!tcp_probe.log)
                 goto err0;
 
-        if (!proc_net_fops_create(procname, S_IRUSR, &tcpprobe_fops))
+        if (!proc_net_fops_create(&init_net, procname, S_IRUSR, &tcpprobe_fops))
                 goto err0;
 
         ret = register_jprobe(&tcp_jprobe);
@@ -238,7 +239,7 @@ static __init int tcpprobe_init(void)
         pr_info("TCP probe registered (port=%d)\n", port);
         return 0;
  err1:
-        proc_net_remove(procname);
+        proc_net_remove(&init_net, procname);
  err0:
         kfree(tcp_probe.log);
         return ret;
@@ -247,7 +248,7 @@ module_init(tcpprobe_init);
 
 static __exit void tcpprobe_exit(void)
 {
-        proc_net_remove(procname);
+        proc_net_remove(&init_net, procname);
         unregister_jprobe(&tcp_jprobe);
         kfree(tcp_probe.log);
 }
diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
index a581b543bff7..ef4d901ee9ad 100644
--- a/net/ipv4/udp.c
+++ b/net/ipv4/udp.c
@@ -98,6 +98,7 @@
 #include <linux/skbuff.h>
 #include <linux/proc_fs.h>
 #include <linux/seq_file.h>
+#include <net/net_namespace.h>
 #include <net/icmp.h>
 #include <net/route.h>
 #include <net/checksum.h>
@@ -1566,7 +1567,7 @@ int udp_proc_register(struct udp_seq_afinfo *afinfo)
         afinfo->seq_fops->llseek        = seq_lseek;
         afinfo->seq_fops->release       = seq_release_private;
 
-        p = proc_net_fops_create(afinfo->name, S_IRUGO, afinfo->seq_fops);
+        p = proc_net_fops_create(&init_net, afinfo->name, S_IRUGO, afinfo->seq_fops);
         if (p)
                 p->data = afinfo;
         else
@@ -1578,7 +1579,7 @@ void udp_proc_unregister(struct udp_seq_afinfo *afinfo)
 {
         if (!afinfo)
                 return;
-        proc_net_remove(afinfo->name);
+        proc_net_remove(&init_net, afinfo->name);
         memset(afinfo->seq_fops, 0, sizeof(*afinfo->seq_fops));
 }
 
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
index 45b4c82148a0..cd2db728d183 100644
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
@@ -62,6 +62,7 @@
 #include <linux/notifier.h>
 #include <linux/string.h>
 
+#include <net/net_namespace.h>
 #include <net/sock.h>
 #include <net/snmp.h>
 
@@ -2827,14 +2828,14 @@ static const struct file_operations if6_fops = {
 
 int __init if6_proc_init(void)
 {
-        if (!proc_net_fops_create("if_inet6", S_IRUGO, &if6_fops))
+        if (!proc_net_fops_create(&init_net, "if_inet6", S_IRUGO, &if6_fops))
                 return -ENOMEM;
         return 0;
 }
 
 void if6_proc_exit(void)
 {
-        proc_net_remove("if_inet6");
+        proc_net_remove(&init_net, "if_inet6");
 }
 #endif  /* CONFIG_PROC_FS */
 
@@ -4293,6 +4294,6 @@ void __exit addrconf_cleanup(void)
         rtnl_unlock();
 
 #ifdef CONFIG_PROC_FS
-        proc_net_remove("if_inet6");
+        proc_net_remove(&init_net, "if_inet6");
 #endif
 }
diff --git a/net/ipv6/anycast.c b/net/ipv6/anycast.c
index b8c533fbdb63..0bd665498d06 100644
--- a/net/ipv6/anycast.c
+++ b/net/ipv6/anycast.c
@@ -30,6 +30,7 @@
 #include <linux/proc_fs.h>
 #include <linux/seq_file.h>
 
+#include <net/net_namespace.h>
 #include <net/sock.h>
 #include <net/snmp.h>
 
@@ -578,7 +579,7 @@ static const struct file_operations ac6_seq_fops = {
 
 int __init ac6_proc_init(void)
 {
-        if (!proc_net_fops_create("anycast6", S_IRUGO, &ac6_seq_fops))
+        if (!proc_net_fops_create(&init_net, "anycast6", S_IRUGO, &ac6_seq_fops))
                 return -ENOMEM;
 
         return 0;
@@ -586,7 +587,7 @@ int __init ac6_proc_init(void)
 
 void ac6_proc_exit(void)
 {
-        proc_net_remove("anycast6");
+        proc_net_remove(&init_net, "anycast6");
 }
 #endif
 
diff --git a/net/ipv6/ip6_flowlabel.c b/net/ipv6/ip6_flowlabel.c
index 413a4ebb195c..1791399c7f10 100644
--- a/net/ipv6/ip6_flowlabel.c
+++ b/net/ipv6/ip6_flowlabel.c
@@ -21,6 +21,7 @@
 #include <linux/proc_fs.h>
 #include <linux/seq_file.h>
 
+#include <net/net_namespace.h>
 #include <net/sock.h>
 
 #include <net/ipv6.h>
@@ -690,7 +691,7 @@ static const struct file_operations ip6fl_seq_fops = {
 void ip6_flowlabel_init(void)
 {
 #ifdef CONFIG_PROC_FS
-        proc_net_fops_create("ip6_flowlabel", S_IRUGO, &ip6fl_seq_fops);
+        proc_net_fops_create(&init_net, "ip6_flowlabel", S_IRUGO, &ip6fl_seq_fops);
 #endif
 }
 
@@ -698,6 +699,6 @@ void ip6_flowlabel_cleanup(void)
 {
         del_timer(&ip6_fl_gc_timer);
 #ifdef CONFIG_PROC_FS
-        proc_net_remove("ip6_flowlabel");
+        proc_net_remove(&init_net, "ip6_flowlabel");
 #endif
 }
diff --git a/net/ipv6/mcast.c b/net/ipv6/mcast.c
index ae9881832a7e..a41d5a0b50cc 100644
--- a/net/ipv6/mcast.c
+++ b/net/ipv6/mcast.c
@@ -49,6 +49,7 @@
 #include <linux/netfilter.h>
 #include <linux/netfilter_ipv6.h>
 
+#include <net/net_namespace.h>
 #include <net/sock.h>
 #include <net/snmp.h>
 
@@ -2658,8 +2659,8 @@ int __init igmp6_init(struct net_proto_family *ops)
         np->hop_limit = 1;
 
 #ifdef CONFIG_PROC_FS
-        proc_net_fops_create("igmp6", S_IRUGO, &igmp6_mc_seq_fops);
-        proc_net_fops_create("mcfilter6", S_IRUGO, &igmp6_mcf_seq_fops);
+        proc_net_fops_create(&init_net, "igmp6", S_IRUGO, &igmp6_mc_seq_fops);
+        proc_net_fops_create(&init_net, "mcfilter6", S_IRUGO, &igmp6_mcf_seq_fops);
 #endif
 
         return 0;
@@ -2671,7 +2672,7 @@ void igmp6_cleanup(void)
         igmp6_socket = NULL; /* for safety */
 
 #ifdef CONFIG_PROC_FS
-        proc_net_remove("mcfilter6");
-        proc_net_remove("igmp6");
+        proc_net_remove(&init_net, "mcfilter6");
+        proc_net_remove(&init_net, "igmp6");
 #endif
 }
diff --git a/net/ipv6/netfilter/ip6_queue.c b/net/ipv6/netfilter/ip6_queue.c
index 0004db38af6d..dfc58fbdb68b 100644
--- a/net/ipv6/netfilter/ip6_queue.c
+++ b/net/ipv6/netfilter/ip6_queue.c
@@ -24,6 +24,7 @@
 #include <linux/sysctl.h>
 #include <linux/proc_fs.h>
 #include <linux/mutex.h>
+#include <net/net_namespace.h>
 #include <net/sock.h>
 #include <net/ipv6.h>
 #include <net/ip6_route.h>
@@ -664,7 +665,7 @@ static int __init ip6_queue_init(void)
                 goto cleanup_netlink_notifier;
         }
 
-        proc = proc_net_create(IPQ_PROC_FS_NAME, 0, ipq_get_info);
+        proc = proc_net_create(&init_net, IPQ_PROC_FS_NAME, 0, ipq_get_info);
         if (proc)
                 proc->owner = THIS_MODULE;
         else {
@@ -685,7 +686,7 @@ static int __init ip6_queue_init(void)
 cleanup_sysctl:
         unregister_sysctl_table(ipq_sysctl_header);
         unregister_netdevice_notifier(&ipq_dev_notifier);
-        proc_net_remove(IPQ_PROC_FS_NAME);
+        proc_net_remove(&init_net, IPQ_PROC_FS_NAME);
 
 cleanup_ipqnl:
         sock_release(ipqnl->sk_socket);
@@ -705,7 +706,7 @@ static void __exit ip6_queue_fini(void)
 
         unregister_sysctl_table(ipq_sysctl_header);
         unregister_netdevice_notifier(&ipq_dev_notifier);
-        proc_net_remove(IPQ_PROC_FS_NAME);
+        proc_net_remove(&init_net, IPQ_PROC_FS_NAME);
 
         sock_release(ipqnl->sk_socket);
         mutex_lock(&ipqnl_mutex);
diff --git a/net/ipv6/proc.c b/net/ipv6/proc.c
index 920dc9cf6a84..a712a2289484 100644
--- a/net/ipv6/proc.c
+++ b/net/ipv6/proc.c
@@ -23,6 +23,7 @@
 #include <linux/proc_fs.h>
 #include <linux/seq_file.h>
 #include <linux/stddef.h>
+#include <net/net_namespace.h>
 #include <net/ip.h>
 #include <net/sock.h>
 #include <net/tcp.h>
@@ -231,22 +232,22 @@ int __init ipv6_misc_proc_init(void)
 {
         int rc = 0;
 
-        if (!proc_net_fops_create("snmp6", S_IRUGO, &snmp6_seq_fops))
+        if (!proc_net_fops_create(&init_net, "snmp6", S_IRUGO, &snmp6_seq_fops))
                 goto proc_snmp6_fail;
 
-        proc_net_devsnmp6 = proc_mkdir("dev_snmp6", proc_net);
+        proc_net_devsnmp6 = proc_mkdir("dev_snmp6", init_net.proc_net);
         if (!proc_net_devsnmp6)
                 goto proc_dev_snmp6_fail;
 
-        if (!proc_net_fops_create("sockstat6", S_IRUGO, &sockstat6_seq_fops))
+        if (!proc_net_fops_create(&init_net, "sockstat6", S_IRUGO, &sockstat6_seq_fops))
                 goto proc_sockstat6_fail;
 out:
         return rc;
 
 proc_sockstat6_fail:
-        proc_net_remove("dev_snmp6");
+        proc_net_remove(&init_net, "dev_snmp6");
 proc_dev_snmp6_fail:
-        proc_net_remove("snmp6");
+        proc_net_remove(&init_net, "snmp6");
 proc_snmp6_fail:
         rc = -ENOMEM;
         goto out;
@@ -254,8 +255,8 @@ proc_snmp6_fail:
 
 void ipv6_misc_proc_exit(void)
 {
-        proc_net_remove("sockstat6");
-        proc_net_remove("dev_snmp6");
-        proc_net_remove("snmp6");
+        proc_net_remove(&init_net, "sockstat6");
+        proc_net_remove(&init_net, "dev_snmp6");
+        proc_net_remove(&init_net, "snmp6");
 }
 
diff --git a/net/ipv6/raw.c b/net/ipv6/raw.c
index 77167afa3455..38a3d21c2585 100644
--- a/net/ipv6/raw.c
+++ b/net/ipv6/raw.c
@@ -35,6 +35,7 @@
 #include <asm/uaccess.h>
 #include <asm/ioctls.h>
 
+#include <net/net_namespace.h>
 #include <net/ip.h>
 #include <net/sock.h>
 #include <net/snmp.h>
@@ -1315,13 +1316,13 @@ static const struct file_operations raw6_seq_fops = {
 
 int __init raw6_proc_init(void)
 {
-        if (!proc_net_fops_create("raw6", S_IRUGO, &raw6_seq_fops))
+        if (!proc_net_fops_create(&init_net, "raw6", S_IRUGO, &raw6_seq_fops))
                 return -ENOMEM;
         return 0;
 }
 
 void raw6_proc_exit(void)
 {
-        proc_net_remove("raw6");
+        proc_net_remove(&init_net, "raw6");
 }
 #endif  /* CONFIG_PROC_FS */
diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index 55ea80fac601..f4f0c341e5c8 100644
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -44,6 +44,7 @@
 #include <linux/seq_file.h>
 #endif
 
+#include <net/net_namespace.h>
 #include <net/snmp.h>
 #include <net/ipv6.h>
 #include <net/ip6_fib.h>
@@ -2561,11 +2562,11 @@ void __init ip6_route_init(void)
 
         fib6_init();
 #ifdef  CONFIG_PROC_FS
-        p = proc_net_create("ipv6_route", 0, rt6_proc_info);
+        p = proc_net_create(&init_net, "ipv6_route", 0, rt6_proc_info);
         if (p)
                 p->owner = THIS_MODULE;
 
-        proc_net_fops_create("rt6_stats", S_IRUGO, &rt6_stats_seq_fops);
+        proc_net_fops_create(&init_net, "rt6_stats", S_IRUGO, &rt6_stats_seq_fops);
 #endif
 #ifdef CONFIG_XFRM
         xfrm6_init();
@@ -2585,8 +2586,8 @@ void ip6_route_cleanup(void)
         fib6_rules_cleanup();
 #endif
 #ifdef CONFIG_PROC_FS
-        proc_net_remove("ipv6_route");
-        proc_net_remove("rt6_stats");
+        proc_net_remove(&init_net, "ipv6_route");
+        proc_net_remove(&init_net, "rt6_stats");
 #endif
 #ifdef CONFIG_XFRM
         xfrm6_fini();
diff --git a/net/ipx/ipx_proc.c b/net/ipx/ipx_proc.c
index 4226e71ae1e3..d483a00dc427 100644
--- a/net/ipx/ipx_proc.c
+++ b/net/ipx/ipx_proc.c
@@ -9,6 +9,7 @@
 #include <linux/proc_fs.h>
 #include <linux/spinlock.h>
 #include <linux/seq_file.h>
+#include <net/net_namespace.h>
 #include <net/tcp_states.h>
 #include <net/ipx.h>
 
@@ -353,7 +354,7 @@ int __init ipx_proc_init(void)
         struct proc_dir_entry *p;
         int rc = -ENOMEM;
 
-        ipx_proc_dir = proc_mkdir("ipx", proc_net);
+        ipx_proc_dir = proc_mkdir("ipx", init_net.proc_net);
 
         if (!ipx_proc_dir)
                 goto out;
@@ -381,7 +382,7 @@ out_socket:
 out_route:
         remove_proc_entry("interface", ipx_proc_dir);
 out_interface:
-        remove_proc_entry("ipx", proc_net);
+        remove_proc_entry("ipx", init_net.proc_net);
         goto out;
 }
 
@@ -390,7 +391,7 @@ void __exit ipx_proc_exit(void)
         remove_proc_entry("interface", ipx_proc_dir);
         remove_proc_entry("route", ipx_proc_dir);
         remove_proc_entry("socket", ipx_proc_dir);
-        remove_proc_entry("ipx", proc_net);
+        remove_proc_entry("ipx", init_net.proc_net);
 }
 
 #else /* CONFIG_PROC_FS */
diff --git a/net/irda/irproc.c b/net/irda/irproc.c
index 181cb51b48a8..cae24fbda966 100644
--- a/net/irda/irproc.c
+++ b/net/irda/irproc.c
@@ -28,6 +28,7 @@
 #include <linux/seq_file.h>
 #include <linux/module.h>
 #include <linux/init.h>
+#include <net/net_namespace.h>
 
 #include <net/irda/irda.h>
 #include <net/irda/irlap.h>
@@ -66,7 +67,7 @@ void __init irda_proc_register(void)
         int i;
         struct proc_dir_entry *d;
 
-        proc_irda = proc_mkdir("irda", proc_net);
+        proc_irda = proc_mkdir("irda", init_net.proc_net);
         if (proc_irda == NULL)
                 return;
         proc_irda->owner = THIS_MODULE;
@@ -92,7 +93,7 @@ void irda_proc_unregister(void)
                 for (i=0; i<ARRAY_SIZE(irda_dirs); i++)
                         remove_proc_entry(irda_dirs[i].name, proc_irda);
 
-                remove_proc_entry("irda", proc_net);
+                remove_proc_entry("irda", init_net.proc_net);
                 proc_irda = NULL;
         }
 }
diff --git a/net/key/af_key.c b/net/key/af_key.c
index 0241fff95137..5b802bbb856e 100644
--- a/net/key/af_key.c
+++ b/net/key/af_key.c
@@ -26,6 +26,7 @@
 #include <linux/in6.h>
 #include <linux/proc_fs.h>
 #include <linux/init.h>
+#include <net/net_namespace.h>
 #include <net/xfrm.h>
 
 #include <net/sock.h>
@@ -3776,7 +3777,7 @@ static struct xfrm_mgr pfkeyv2_mgr =
 static void __exit ipsec_pfkey_exit(void)
 {
         xfrm_unregister_km(&pfkeyv2_mgr);
-        remove_proc_entry("net/pfkey", NULL);
+        remove_proc_entry("pfkey", init_net.proc_net);
         sock_unregister(PF_KEY);
         proto_unregister(&key_proto);
 }
@@ -3793,7 +3794,7 @@ static int __init ipsec_pfkey_init(void)
                 goto out_unregister_key_proto;
 #ifdef CONFIG_PROC_FS
         err = -ENOMEM;
-        if (create_proc_read_entry("net/pfkey", 0, NULL, pfkey_read_proc, NULL) == NULL)
+        if (create_proc_read_entry("pfkey", 0, init_net.proc_net, pfkey_read_proc, NULL) == NULL)
                 goto out_sock_unregister;
 #endif
         err = xfrm_register_km(&pfkeyv2_mgr);
diff --git a/net/llc/llc_proc.c b/net/llc/llc_proc.c
index 49be6c902c83..4865d82896b1 100644
--- a/net/llc/llc_proc.c
+++ b/net/llc/llc_proc.c
@@ -17,6 +17,7 @@
 #include <linux/proc_fs.h>
 #include <linux/errno.h>
 #include <linux/seq_file.h>
+#include <net/net_namespace.h>
 #include <net/sock.h>
 #include <net/llc.h>
 #include <net/llc_c_ac.h>
@@ -231,7 +232,7 @@ int __init llc_proc_init(void)
         int rc = -ENOMEM;
         struct proc_dir_entry *p;
 
-        llc_proc_dir = proc_mkdir("llc", proc_net);
+        llc_proc_dir = proc_mkdir("llc", init_net.proc_net);
         if (!llc_proc_dir)
                 goto out;
         llc_proc_dir->owner = THIS_MODULE;
@@ -254,7 +255,7 @@ out:
 out_core:
         remove_proc_entry("socket", llc_proc_dir);
 out_socket:
-        remove_proc_entry("llc", proc_net);
+        remove_proc_entry("llc", init_net.proc_net);
         goto out;
 }
 
@@ -262,5 +263,5 @@ void llc_proc_exit(void)
 {
         remove_proc_entry("socket", llc_proc_dir);
         remove_proc_entry("core", llc_proc_dir);
-        remove_proc_entry("llc", proc_net);
+        remove_proc_entry("llc", init_net.proc_net);
 }
diff --git a/net/netfilter/core.c b/net/netfilter/core.c
index 381a77cf0c9e..a523fa4136ed 100644
--- a/net/netfilter/core.c
+++ b/net/netfilter/core.c
@@ -19,6 +19,7 @@
 #include <linux/inetdevice.h>
 #include <linux/proc_fs.h>
 #include <linux/mutex.h>
+#include <net/net_namespace.h>
 #include <net/sock.h>
 
 #include "nf_internals.h"
@@ -293,7 +294,7 @@ void __init netfilter_init(void)
         }
 
 #ifdef CONFIG_PROC_FS
-        proc_net_netfilter = proc_mkdir("netfilter", proc_net);
+        proc_net_netfilter = proc_mkdir("netfilter", init_net.proc_net);
         if (!proc_net_netfilter)
                 panic("cannot create netfilter proc entry");
 #endif
diff --git a/net/netfilter/nf_conntrack_expect.c b/net/netfilter/nf_conntrack_expect.c
index 3ac64e25f10c..8a3e3af656bf 100644
--- a/net/netfilter/nf_conntrack_expect.c
+++ b/net/netfilter/nf_conntrack_expect.c
@@ -20,6 +20,7 @@
 #include <linux/percpu.h>
 #include <linux/kernel.h>
 #include <linux/jhash.h>
+#include <net/net_namespace.h>
 
 #include <net/netfilter/nf_conntrack.h>
 #include <net/netfilter/nf_conntrack_core.h>
@@ -505,7 +506,7 @@ static int __init exp_proc_init(void)
 #ifdef CONFIG_PROC_FS
         struct proc_dir_entry *proc;
 
-        proc = proc_net_fops_create("nf_conntrack_expect", 0440, &exp_file_ops);
+        proc = proc_net_fops_create(&init_net, "nf_conntrack_expect", 0440, &exp_file_ops);
         if (!proc)
                 return -ENOMEM;
 #endif /* CONFIG_PROC_FS */
@@ -515,7 +516,7 @@ static int __init exp_proc_init(void)
 static void exp_proc_remove(void)
 {
 #ifdef CONFIG_PROC_FS
-        proc_net_remove("nf_conntrack_expect");
+        proc_net_remove(&init_net, "nf_conntrack_expect");
 #endif /* CONFIG_PROC_FS */
 }
 
diff --git a/net/netfilter/nf_conntrack_standalone.c b/net/netfilter/nf_conntrack_standalone.c
index a4ce5e887997..2a19c5f1240f 100644
--- a/net/netfilter/nf_conntrack_standalone.c
+++ b/net/netfilter/nf_conntrack_standalone.c
@@ -14,6 +14,7 @@
 #include <linux/seq_file.h>
 #include <linux/percpu.h>
 #include <linux/netdevice.h>
+#include <net/net_namespace.h>
 #ifdef CONFIG_SYSCTL
 #include <linux/sysctl.h>
 #endif
@@ -420,10 +421,10 @@ static int __init nf_conntrack_standalone_init(void)
                 return ret;
 
 #ifdef CONFIG_PROC_FS
-        proc = proc_net_fops_create("nf_conntrack", 0440, &ct_file_ops);
+        proc = proc_net_fops_create(&init_net, "nf_conntrack", 0440, &ct_file_ops);
         if (!proc) goto cleanup_init;
 
-        proc_stat = create_proc_entry("nf_conntrack", S_IRUGO, proc_net_stat);
+        proc_stat = create_proc_entry("nf_conntrack", S_IRUGO, init_net.proc_net_stat);
         if (!proc_stat)
                 goto cleanup_proc;
 
@@ -444,9 +445,9 @@ static int __init nf_conntrack_standalone_init(void)
  cleanup_proc_stat:
 #endif
 #ifdef CONFIG_PROC_FS
-        remove_proc_entry("nf_conntrack", proc_net_stat);
+        remove_proc_entry("nf_conntrack", init_net. proc_net_stat);
  cleanup_proc:
-        proc_net_remove("nf_conntrack");
+        proc_net_remove(&init_net, "nf_conntrack");
  cleanup_init:
 #endif /* CNFIG_PROC_FS */
         nf_conntrack_cleanup();
@@ -459,8 +460,8 @@ static void __exit nf_conntrack_standalone_fini(void)
         unregister_sysctl_table(nf_ct_sysctl_header);
 #endif
 #ifdef CONFIG_PROC_FS
-        remove_proc_entry("nf_conntrack", proc_net_stat);
-        proc_net_remove("nf_conntrack");
+        remove_proc_entry("nf_conntrack", init_net.proc_net_stat);
+        proc_net_remove(&init_net, "nf_conntrack");
 #endif /* CNFIG_PROC_FS */
         nf_conntrack_cleanup();
 }
diff --git a/net/netfilter/x_tables.c b/net/netfilter/x_tables.c
index cc2baa6d5a7a..d9a3bded0d00 100644
--- a/net/netfilter/x_tables.c
+++ b/net/netfilter/x_tables.c
@@ -22,6 +22,7 @@
 #include <linux/vmalloc.h>
 #include <linux/mutex.h>
 #include <linux/mm.h>
+#include <net/net_namespace.h>
 
 #include <linux/netfilter/x_tables.h>
 #include <linux/netfilter_arp.h>
@@ -795,7 +796,7 @@ int xt_proto_init(int af)
 #ifdef CONFIG_PROC_FS
         strlcpy(buf, xt_prefix[af], sizeof(buf));
         strlcat(buf, FORMAT_TABLES, sizeof(buf));
-        proc = proc_net_fops_create(buf, 0440, &xt_file_ops);
+        proc = proc_net_fops_create(&init_net, buf, 0440, &xt_file_ops);
         if (!proc)
                 goto out;
         proc->data = (void *) ((unsigned long) af | (TABLE << 16));
@@ -803,14 +804,14 @@ int xt_proto_init(int af)
 
         strlcpy(buf, xt_prefix[af], sizeof(buf));
         strlcat(buf, FORMAT_MATCHES, sizeof(buf));
-        proc = proc_net_fops_create(buf, 0440, &xt_file_ops);
+        proc = proc_net_fops_create(&init_net, buf, 0440, &xt_file_ops);
         if (!proc)
                 goto out_remove_tables;
         proc->data = (void *) ((unsigned long) af | (MATCH << 16));
 
         strlcpy(buf, xt_prefix[af], sizeof(buf));
         strlcat(buf, FORMAT_TARGETS, sizeof(buf));
-        proc = proc_net_fops_create(buf, 0440, &xt_file_ops);
+        proc = proc_net_fops_create(&init_net, buf, 0440, &xt_file_ops);
         if (!proc)
                 goto out_remove_matches;
         proc->data = (void *) ((unsigned long) af | (TARGET << 16));
@@ -822,12 +823,12 @@ int xt_proto_init(int af)
 out_remove_matches:
         strlcpy(buf, xt_prefix[af], sizeof(buf));
         strlcat(buf, FORMAT_MATCHES, sizeof(buf));
-        proc_net_remove(buf);
+        proc_net_remove(&init_net, buf);
 
 out_remove_tables:
         strlcpy(buf, xt_prefix[af], sizeof(buf));
         strlcat(buf, FORMAT_TABLES, sizeof(buf));
-        proc_net_remove(buf);
+        proc_net_remove(&init_net, buf);
 out:
         return -1;
 #endif
@@ -841,15 +842,15 @@ void xt_proto_fini(int af)
 
         strlcpy(buf, xt_prefix[af], sizeof(buf));
         strlcat(buf, FORMAT_TABLES, sizeof(buf));
-        proc_net_remove(buf);
+        proc_net_remove(&init_net, buf);
 
         strlcpy(buf, xt_prefix[af], sizeof(buf));
         strlcat(buf, FORMAT_TARGETS, sizeof(buf));
-        proc_net_remove(buf);
+        proc_net_remove(&init_net, buf);
 
         strlcpy(buf, xt_prefix[af], sizeof(buf));
         strlcat(buf, FORMAT_MATCHES, sizeof(buf));
-        proc_net_remove(buf);
+        proc_net_remove(&init_net, buf);
 #endif /*CONFIG_PROC_FS*/
 }
 EXPORT_SYMBOL_GPL(xt_proto_fini);
diff --git a/net/netfilter/xt_hashlimit.c b/net/netfilter/xt_hashlimit.c
index bd45f9d3f7d0..19103678bf20 100644
--- a/net/netfilter/xt_hashlimit.c
+++ b/net/netfilter/xt_hashlimit.c
@@ -21,6 +21,7 @@
 #include <linux/in.h>
 #include <linux/ip.h>
 #include <linux/ipv6.h>
+#include <net/net_namespace.h>
 
 #include <linux/netfilter/x_tables.h>
 #include <linux/netfilter_ipv4/ip_tables.h>
@@ -743,13 +744,13 @@ static int __init xt_hashlimit_init(void)
                 printk(KERN_ERR "xt_hashlimit: unable to create slab cache\n");
                 goto err2;
         }
-        hashlimit_procdir4 = proc_mkdir("ipt_hashlimit", proc_net);
+        hashlimit_procdir4 = proc_mkdir("ipt_hashlimit", init_net.proc_net);
         if (!hashlimit_procdir4) {
                 printk(KERN_ERR "xt_hashlimit: unable to create proc dir "
                                 "entry\n");
                 goto err3;
         }
-        hashlimit_procdir6 = proc_mkdir("ip6t_hashlimit", proc_net);
+        hashlimit_procdir6 = proc_mkdir("ip6t_hashlimit", init_net.proc_net);
         if (!hashlimit_procdir6) {
                 printk(KERN_ERR "xt_hashlimit: unable to create proc dir "
                                 "entry\n");
@@ -757,7 +758,7 @@ static int __init xt_hashlimit_init(void)
         }
         return 0;
 err4:
-        remove_proc_entry("ipt_hashlimit", proc_net);
+        remove_proc_entry("ipt_hashlimit", init_net.proc_net);
 err3:
         kmem_cache_destroy(hashlimit_cachep);
 err2:
@@ -769,8 +770,8 @@ err1:
 
 static void __exit xt_hashlimit_fini(void)
 {
-        remove_proc_entry("ipt_hashlimit", proc_net);
-        remove_proc_entry("ip6t_hashlimit", proc_net);
+        remove_proc_entry("ipt_hashlimit", init_net.proc_net);
+        remove_proc_entry("ip6t_hashlimit", init_net.proc_net);
         kmem_cache_destroy(hashlimit_cachep);
         xt_unregister_matches(xt_hashlimit, ARRAY_SIZE(xt_hashlimit));
 }
diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c
index a78d962e2c70..3982f13dab17 100644
--- a/net/netlink/af_netlink.c
+++ b/net/netlink/af_netlink.c
@@ -57,6 +57,7 @@
 #include <linux/selinux.h>
 #include <linux/mutex.h>
 
+#include <net/net_namespace.h>
 #include <net/sock.h>
 #include <net/scm.h>
 #include <net/netlink.h>
@@ -1927,7 +1928,7 @@ static int __init netlink_proto_init(void)
 
         sock_register(&netlink_family_ops);
 #ifdef CONFIG_PROC_FS
-        proc_net_fops_create("netlink", 0, &netlink_seq_fops);
+        proc_net_fops_create(&init_net, "netlink", 0, &netlink_seq_fops);
 #endif
         /* The netlink device handler may be needed early. */
         rtnetlink_init();
diff --git a/net/netrom/af_netrom.c b/net/netrom/af_netrom.c
index dc9273295a38..15c8a92bd719 100644
--- a/net/netrom/af_netrom.c
+++ b/net/netrom/af_netrom.c
@@ -27,6 +27,7 @@
 #include <linux/netdevice.h>
 #include <linux/if_arp.h>
 #include <linux/skbuff.h>
+#include <net/net_namespace.h>
 #include <net/sock.h>
 #include <asm/uaccess.h>
 #include <asm/system.h>
@@ -1447,9 +1448,9 @@ static int __init nr_proto_init(void)
 
         nr_loopback_init();
 
-        proc_net_fops_create("nr", S_IRUGO, &nr_info_fops);
-        proc_net_fops_create("nr_neigh", S_IRUGO, &nr_neigh_fops);
-        proc_net_fops_create("nr_nodes", S_IRUGO, &nr_nodes_fops);
+        proc_net_fops_create(&init_net, "nr", S_IRUGO, &nr_info_fops);
+        proc_net_fops_create(&init_net, "nr_neigh", S_IRUGO, &nr_neigh_fops);
+        proc_net_fops_create(&init_net, "nr_nodes", S_IRUGO, &nr_nodes_fops);
 out:
         return rc;
 fail:
@@ -1477,9 +1478,9 @@ static void __exit nr_exit(void)
 {
         int i;
 
-        proc_net_remove("nr");
-        proc_net_remove("nr_neigh");
-        proc_net_remove("nr_nodes");
+        proc_net_remove(&init_net, "nr");
+        proc_net_remove(&init_net, "nr_neigh");
+        proc_net_remove(&init_net, "nr_nodes");
         nr_loopback_clear();
 
         nr_rt_free();
diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c
index 9c26dd9ee649..56502292f24c 100644
--- a/net/packet/af_packet.c
+++ b/net/packet/af_packet.c
@@ -61,6 +61,7 @@
 #include <linux/wireless.h>
 #include <linux/kernel.h>
 #include <linux/kmod.h>
+#include <net/net_namespace.h>
 #include <net/ip.h>
 #include <net/protocol.h>
 #include <linux/skbuff.h>
@@ -1951,7 +1952,7 @@ static const struct file_operations packet_seq_fops = {
 
 static void __exit packet_exit(void)
 {
-        proc_net_remove("packet");
+        proc_net_remove(&init_net, "packet");
         unregister_netdevice_notifier(&packet_netdev_notifier);
         sock_unregister(PF_PACKET);
         proto_unregister(&packet_proto);
@@ -1966,7 +1967,7 @@ static int __init packet_init(void)
 
         sock_register(&packet_family_ops);
         register_netdevice_notifier(&packet_netdev_notifier);
-        proc_net_fops_create("packet", 0, &packet_seq_fops);
+        proc_net_fops_create(&init_net, "packet", 0, &packet_seq_fops);
 out:
         return rc;
 }
diff --git a/net/rose/af_rose.c b/net/rose/af_rose.c
index 976c3cc86a29..48319f7991ac 100644
--- a/net/rose/af_rose.c
+++ b/net/rose/af_rose.c
@@ -26,6 +26,7 @@
 #include <linux/sockios.h>
 #include <linux/net.h>
 #include <linux/stat.h>
+#include <net/net_namespace.h>
 #include <net/ax25.h>
 #include <linux/inet.h>
 #include <linux/netdevice.h>
@@ -1576,10 +1577,10 @@ static int __init rose_proto_init(void)
 
         rose_add_loopback_neigh();
 
-        proc_net_fops_create("rose", S_IRUGO, &rose_info_fops);
-        proc_net_fops_create("rose_neigh", S_IRUGO, &rose_neigh_fops);
-        proc_net_fops_create("rose_nodes", S_IRUGO, &rose_nodes_fops);
-        proc_net_fops_create("rose_routes", S_IRUGO, &rose_routes_fops);
+        proc_net_fops_create(&init_net, "rose", S_IRUGO, &rose_info_fops);
+        proc_net_fops_create(&init_net, "rose_neigh", S_IRUGO, &rose_neigh_fops);
+        proc_net_fops_create(&init_net, "rose_nodes", S_IRUGO, &rose_nodes_fops);
+        proc_net_fops_create(&init_net, "rose_routes", S_IRUGO, &rose_routes_fops);
 out:
         return rc;
 fail:
@@ -1606,10 +1607,10 @@ static void __exit rose_exit(void)
 {
         int i;
 
-        proc_net_remove("rose");
-        proc_net_remove("rose_neigh");
-        proc_net_remove("rose_nodes");
-        proc_net_remove("rose_routes");
+        proc_net_remove(&init_net, "rose");
+        proc_net_remove(&init_net, "rose_neigh");
+        proc_net_remove(&init_net, "rose_nodes");
+        proc_net_remove(&init_net, "rose_routes");
         rose_loopback_clear();
 
         rose_rt_free();
diff --git a/net/rxrpc/af_rxrpc.c b/net/rxrpc/af_rxrpc.c
index c58fa0d1be26..122d55d992e1 100644
--- a/net/rxrpc/af_rxrpc.c
+++ b/net/rxrpc/af_rxrpc.c
@@ -14,6 +14,7 @@
 #include <linux/skbuff.h>
 #include <linux/poll.h>
 #include <linux/proc_fs.h>
+#include <net/net_namespace.h>
 #include <net/sock.h>
 #include <net/af_rxrpc.h>
 #include "ar-internal.h"
@@ -829,8 +830,8 @@ static int __init af_rxrpc_init(void)
         }
 
 #ifdef CONFIG_PROC_FS
-        proc_net_fops_create("rxrpc_calls", 0, &rxrpc_call_seq_fops);
-        proc_net_fops_create("rxrpc_conns", 0, &rxrpc_connection_seq_fops);
+        proc_net_fops_create(&init_net, "rxrpc_calls", 0, &rxrpc_call_seq_fops);
+        proc_net_fops_create(&init_net, "rxrpc_conns", 0, &rxrpc_connection_seq_fops);
 #endif
         return 0;
 
@@ -868,8 +869,8 @@ static void __exit af_rxrpc_exit(void)
 
         _debug("flush scheduled work");
         flush_workqueue(rxrpc_workqueue);
-        proc_net_remove("rxrpc_conns");
-        proc_net_remove("rxrpc_calls");
+        proc_net_remove(&init_net, "rxrpc_conns");
+        proc_net_remove(&init_net, "rxrpc_calls");
         destroy_workqueue(rxrpc_workqueue);
         kmem_cache_destroy(rxrpc_call_jar);
         _leave("");
diff --git a/net/sched/sch_api.c b/net/sched/sch_api.c
index dee0d5fb39c5..efc383c58f1e 100644
--- a/net/sched/sch_api.c
+++ b/net/sched/sch_api.c
@@ -28,6 +28,7 @@
 #include <linux/list.h>
 #include <linux/hrtimer.h>
 
+#include <net/net_namespace.h>
 #include <net/netlink.h>
 #include <net/pkt_sched.h>
 
@@ -1251,7 +1252,7 @@ static int __init pktsched_init(void)
 {
         register_qdisc(&pfifo_qdisc_ops);
         register_qdisc(&bfifo_qdisc_ops);
-        proc_net_fops_create("psched", 0, &psched_fops);
+        proc_net_fops_create(&init_net, "psched", 0, &psched_fops);
 
         rtnl_register(PF_UNSPEC, RTM_NEWQDISC, tc_modify_qdisc, NULL);
         rtnl_register(PF_UNSPEC, RTM_DELQDISC, tc_get_qdisc, NULL);
diff --git a/net/sctp/protocol.c b/net/sctp/protocol.c
index 957c118a6068..30929e3ca05a 100644
--- a/net/sctp/protocol.c
+++ b/net/sctp/protocol.c
@@ -52,6 +52,7 @@
 #include <linux/inetdevice.h>
 #include <linux/seq_file.h>
 #include <linux/bootmem.h>
+#include <net/net_namespace.h>
 #include <net/protocol.h>
 #include <net/ip.h>
 #include <net/ipv6.h>
@@ -98,7 +99,7 @@ static __init int sctp_proc_init(void)
 {
         if (!proc_net_sctp) {
                 struct proc_dir_entry *ent;
-                ent = proc_mkdir("net/sctp", NULL);
+                ent = proc_mkdir("sctp", init_net.proc_net);
                 if (ent) {
                         ent->owner = THIS_MODULE;
                         proc_net_sctp = ent;
@@ -131,7 +132,7 @@ static void sctp_proc_exit(void)
 
         if (proc_net_sctp) {
                 proc_net_sctp = NULL;
-                remove_proc_entry("net/sctp", NULL);
+                remove_proc_entry("sctp", init_net.proc_net);
         }
 }
 
diff --git a/net/sunrpc/stats.c b/net/sunrpc/stats.c
index 74ba7d443dfc..4d4f3738b688 100644
--- a/net/sunrpc/stats.c
+++ b/net/sunrpc/stats.c
@@ -21,6 +21,7 @@
 #include <linux/sunrpc/clnt.h>
 #include <linux/sunrpc/svcsock.h>
 #include <linux/sunrpc/metrics.h>
+#include <net/net_namespace.h>
 
 #define RPCDBG_FACILITY RPCDBG_MISC
 
@@ -265,7 +266,7 @@ rpc_proc_init(void)
         dprintk("RPC:       registering /proc/net/rpc\n");
         if (!proc_net_rpc) {
                 struct proc_dir_entry *ent;
-                ent = proc_mkdir("rpc", proc_net);
+                ent = proc_mkdir("rpc", init_net.proc_net);
                 if (ent) {
                         ent->owner = THIS_MODULE;
                         proc_net_rpc = ent;
@@ -279,7 +280,7 @@ rpc_proc_exit(void)
         dprintk("RPC:       unregistering /proc/net/rpc\n");
         if (proc_net_rpc) {
                 proc_net_rpc = NULL;
-                remove_proc_entry("net/rpc", NULL);
+                remove_proc_entry("rpc", init_net.proc_net);
         }
 }
 
diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c
index a05c34260e70..2386090c3a16 100644
--- a/net/unix/af_unix.c
+++ b/net/unix/af_unix.c
@@ -103,6 +103,7 @@
 #include <asm/uaccess.h>
 #include <linux/skbuff.h>
 #include <linux/netdevice.h>
+#include <net/net_namespace.h>
 #include <net/sock.h>
 #include <net/tcp_states.h>
 #include <net/af_unix.h>
@@ -2135,7 +2136,7 @@ static int __init af_unix_init(void)
 
         sock_register(&unix_family_ops);
 #ifdef CONFIG_PROC_FS
-        proc_net_fops_create("unix", 0, &unix_seq_fops);
+        proc_net_fops_create(&init_net, "unix", 0, &unix_seq_fops);
 #endif
         unix_sysctl_register();
 out:
@@ -2146,7 +2147,7 @@ static void __exit af_unix_exit(void)
 {
         sock_unregister(PF_UNIX);
         unix_sysctl_unregister();
-        proc_net_remove("unix");
+        proc_net_remove(&init_net, "unix");
         proto_unregister(&unix_proto);
 }
 
diff --git a/net/wanrouter/wanproc.c b/net/wanrouter/wanproc.c
index 236e7eaf1b7f..f2e54c3f064e 100644
--- a/net/wanrouter/wanproc.c
+++ b/net/wanrouter/wanproc.c
@@ -29,6 +29,7 @@
 #include <linux/seq_file.h>
 #include <linux/smp_lock.h>
 
+#include <net/net_namespace.h>
 #include <asm/io.h>
 
 #define PROC_STATS_FORMAT "%30s: %12lu\n"
@@ -287,7 +288,7 @@ static const struct file_operations wandev_fops = {
 int __init wanrouter_proc_init(void)
 {
         struct proc_dir_entry *p;
-        proc_router = proc_mkdir(ROUTER_NAME, proc_net);
+        proc_router = proc_mkdir(ROUTER_NAME, init_net.proc_net);
         if (!proc_router)
                 goto fail;
 
@@ -303,7 +304,7 @@ int __init wanrouter_proc_init(void)
 fail_stat:
         remove_proc_entry("config", proc_router);
 fail_config:
-        remove_proc_entry(ROUTER_NAME, proc_net);
+        remove_proc_entry(ROUTER_NAME, init_net.proc_net);
 fail:
         return -ENOMEM;
 }
@@ -316,7 +317,7 @@ void wanrouter_proc_cleanup(void)
 {
         remove_proc_entry("config", proc_router);
         remove_proc_entry("status", proc_router);
-        remove_proc_entry(ROUTER_NAME, proc_net);
+        remove_proc_entry(ROUTER_NAME, init_net.proc_net);
 }
 
 /*
diff --git a/net/wireless/wext.c b/net/wireless/wext.c
index debf5191a128..b8069afe0410 100644
--- a/net/wireless/wext.c
+++ b/net/wireless/wext.c
@@ -93,6 +93,7 @@
 #include <linux/if_arp.h>               /* ARPHRD_ETHER */
 #include <linux/etherdevice.h>          /* compare_ether_addr */
 #include <linux/interrupt.h>
+#include <net/net_namespace.h>
 
 #include <linux/wireless.h>             /* Pretty obvious */
 #include <net/iw_handler.h>             /* New driver API */
@@ -686,7 +687,7 @@ static const struct file_operations wireless_seq_fops = {
 int __init wext_proc_init(void)
 {
         /* Create /proc/net/wireless entry */
-        if (!proc_net_fops_create("wireless", S_IRUGO, &wireless_seq_fops))
+        if (!proc_net_fops_create(&init_net, "wireless", S_IRUGO, &wireless_seq_fops))
                 return -ENOMEM;
 
         return 0;
diff --git a/net/x25/x25_proc.c b/net/x25/x25_proc.c
index 7405b9c5b7f2..7d55e50c936f 100644
--- a/net/x25/x25_proc.c
+++ b/net/x25/x25_proc.c
@@ -20,6 +20,7 @@
 #include <linux/init.h>
 #include <linux/proc_fs.h>
 #include <linux/seq_file.h>
+#include <net/net_namespace.h>
 #include <net/sock.h>
 #include <net/x25.h>
 
@@ -301,7 +302,7 @@ int __init x25_proc_init(void)
         struct proc_dir_entry *p;
         int rc = -ENOMEM;
 
-        x25_proc_dir = proc_mkdir("x25", proc_net);
+        x25_proc_dir = proc_mkdir("x25", init_net.proc_net);
         if (!x25_proc_dir)
                 goto out;
 
@@ -328,7 +329,7 @@ out_forward:
 out_socket:
         remove_proc_entry("route", x25_proc_dir);
 out_route:
-        remove_proc_entry("x25", proc_net);
+        remove_proc_entry("x25", init_net.proc_net);
         goto out;
 }
 
@@ -337,7 +338,7 @@ void __exit x25_proc_exit(void)
         remove_proc_entry("forward", x25_proc_dir);
         remove_proc_entry("route", x25_proc_dir);
         remove_proc_entry("socket", x25_proc_dir);
-        remove_proc_entry("x25", proc_net);
+        remove_proc_entry("x25", init_net.proc_net);
 }
 
 #else /* CONFIG_PROC_FS */