diff options
author | Eric W. Biederman <ebiederm@xmission.com> | 2007-09-12 06:01:34 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-10-10 19:49:06 -0400 |
commit | 457c4cbc5a3dde259d2a1f15d5f9785290397267 (patch) | |
tree | a2ceee88780cbce27433b9a4434b3e9251efd81a /net/rxrpc | |
parent | 07feaebfcc10cd35e745c7073667935246494bee (diff) |
[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>
Diffstat (limited to 'net/rxrpc')
-rw-r--r-- | net/rxrpc/af_rxrpc.c | 9 |
1 files changed, 5 insertions, 4 deletions
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 @@ | |||
14 | #include <linux/skbuff.h> | 14 | #include <linux/skbuff.h> |
15 | #include <linux/poll.h> | 15 | #include <linux/poll.h> |
16 | #include <linux/proc_fs.h> | 16 | #include <linux/proc_fs.h> |
17 | #include <net/net_namespace.h> | ||
17 | #include <net/sock.h> | 18 | #include <net/sock.h> |
18 | #include <net/af_rxrpc.h> | 19 | #include <net/af_rxrpc.h> |
19 | #include "ar-internal.h" | 20 | #include "ar-internal.h" |
@@ -829,8 +830,8 @@ static int __init af_rxrpc_init(void) | |||
829 | } | 830 | } |
830 | 831 | ||
831 | #ifdef CONFIG_PROC_FS | 832 | #ifdef CONFIG_PROC_FS |
832 | proc_net_fops_create("rxrpc_calls", 0, &rxrpc_call_seq_fops); | 833 | proc_net_fops_create(&init_net, "rxrpc_calls", 0, &rxrpc_call_seq_fops); |
833 | proc_net_fops_create("rxrpc_conns", 0, &rxrpc_connection_seq_fops); | 834 | proc_net_fops_create(&init_net, "rxrpc_conns", 0, &rxrpc_connection_seq_fops); |
834 | #endif | 835 | #endif |
835 | return 0; | 836 | return 0; |
836 | 837 | ||
@@ -868,8 +869,8 @@ static void __exit af_rxrpc_exit(void) | |||
868 | 869 | ||
869 | _debug("flush scheduled work"); | 870 | _debug("flush scheduled work"); |
870 | flush_workqueue(rxrpc_workqueue); | 871 | flush_workqueue(rxrpc_workqueue); |
871 | proc_net_remove("rxrpc_conns"); | 872 | proc_net_remove(&init_net, "rxrpc_conns"); |
872 | proc_net_remove("rxrpc_calls"); | 873 | proc_net_remove(&init_net, "rxrpc_calls"); |
873 | destroy_workqueue(rxrpc_workqueue); | 874 | destroy_workqueue(rxrpc_workqueue); |
874 | kmem_cache_destroy(rxrpc_call_jar); | 875 | kmem_cache_destroy(rxrpc_call_jar); |
875 | _leave(""); | 876 | _leave(""); |