patch-1.3.17 linux/fs/proc/inode.c

Next file: linux/fs/proc/net.c
Previous file: linux/fs/proc/base.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v1.3.16/linux/fs/proc/inode.c linux/fs/proc/inode.c
@@ -18,6 +18,7 @@
 #include <asm/segment.h>
 
 extern unsigned long prof_len;
+extern void proc_net_init(void);
 
 void proc_put_inode(struct inode *inode)
 {
@@ -90,6 +91,7 @@
 		return NULL;
 	}
 	parse_options(data, &s->s_mounted->i_uid, &s->s_mounted->i_gid);
+	proc_net_init();
 	return s;
 }
 
@@ -141,22 +143,22 @@
 		return;
 	}
 
-#ifdef CONFIG_IP_ACCT
+/* #ifdef CONFIG_IP_ACCT */
 	/* this file may be opened R/W by root to reset the accounting */
 	if (ino == PROC_NET_IPACCT) {
 		inode->i_mode = S_IFREG | S_IRUGO | S_IWUSR;
 		inode->i_op = &proc_net_inode_operations;
 		return;
 	}
-#endif
-#ifdef CONFIG_IP_FIREWALL
+/* #endif */
+/* #ifdef CONFIG_IP_FIREWALL */
 	/* these files may be opened R/W by root to reset the counters */
 	if ((ino == PROC_NET_IPFWFWD) || (ino == PROC_NET_IPFWBLK)) {
 		inode->i_mode = S_IFREG | S_IRUGO | S_IWUSR;
 		inode->i_op = &proc_net_inode_operations;
 		return;
 	}
-#endif
+/* #endif */
 
 	/* other files within /proc/net */
 	if ((ino >= PROC_NET_UNIX) && (ino < PROC_NET_LAST)) {

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov with Sam's (original) version
of this