diff options
author | Pavel Emelyanov <xemul@openvz.org> | 2007-12-01 15:51:01 +0300 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-01-29 01:55:23 +0300 |
commit | 1597fbc0faf88c42edb3fe42e92e53b83c3f120e (patch) | |
tree | 17a56a96af0e00a1af452f0530997585803b6c7b /net/unix/sysctl_net_unix.c | |
parent | 1d430b913c2e6293a80a4a422406bc9489a476ad (diff) | |
download | linux-1597fbc0faf88c42edb3fe42e92e53b83c3f120e.tar.xz |
[UNIX]: Make the unix sysctl tables per-namespace
This is the core.
* add the ctl_table_header on the struct net;
* make the unix_sysctl_register and _unregister clone the table;
* moves calls to them into per-net init and exit callbacks;
* move the .data pointer in the proper place.
Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Acked-by: Eric W. Biederman <ebiederm@xmission.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/unix/sysctl_net_unix.c')
-rw-r--r-- | net/unix/sysctl_net_unix.c | 27 |
1 files changed, 22 insertions, 5 deletions
diff --git a/net/unix/sysctl_net_unix.c b/net/unix/sysctl_net_unix.c index 43dd356730fd..553ef6a487d0 100644 --- a/net/unix/sysctl_net_unix.c +++ b/net/unix/sysctl_net_unix.c @@ -32,16 +32,33 @@ static struct ctl_path unix_path[] = { { }, }; -static struct ctl_table_header * unix_sysctl_header; - int unix_sysctl_register(struct net *net) { - unix_sysctl_header = register_sysctl_paths(unix_path, unix_table); - return unix_sysctl_header == NULL ? -ENOMEM : 0; + struct ctl_table *table; + + table = kmemdup(unix_table, sizeof(unix_table), GFP_KERNEL); + if (table == NULL) + goto err_alloc; + + table[0].data = &net->sysctl_unix_max_dgram_qlen; + net->unix_ctl = register_net_sysctl_table(net, unix_path, table); + if (net->unix_ctl == NULL) + goto err_reg; + + return 0; + +err_reg: + kfree(table); +err_alloc: + return -ENOMEM; } void unix_sysctl_unregister(struct net *net) { - unregister_sysctl_table(unix_sysctl_header); + struct ctl_table *table; + + table = net->unix_ctl->ctl_table_arg; + unregister_sysctl_table(net->unix_ctl); + kfree(table); } |