lkml.org 
[lkml]   [2011]   [Apr]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH 14/24] sysctl: cookie: share unix_table between nets
Date
Signed-off-by: Lucian Adrian Grijincu <lucian.grijincu@gmail.com>
---
net/unix/sysctl_net_unix.c | 22 +++-------------------
1 files changed, 3 insertions(+), 19 deletions(-)
diff --git a/net/unix/sysctl_net_unix.c b/net/unix/sysctl_net_unix.c
index 397cffe..d514f62 100644
--- a/net/unix/sysctl_net_unix.c
+++ b/net/unix/sysctl_net_unix.c
@@ -21,7 +21,7 @@ static ctl_table unix_table[] = {
.data = &init_net.unx.sysctl_max_dgram_qlen,
.maxlen = sizeof(int),
.mode = 0644,
- .proc_handler = proc_dointvec
+ .proc_handler = netns_proc_dointvec,
},
{ }
};
@@ -34,30 +34,14 @@ static struct ctl_path unix_path[] = {

int __net_init unix_sysctl_register(struct net *net)
{
- struct ctl_table *table;
-
- table = kmemdup(unix_table, sizeof(unix_table), GFP_KERNEL);
- if (table == NULL)
- goto err_alloc;
-
- table[0].data = &net->unx.sysctl_max_dgram_qlen;
- net->unx.ctl = register_net_sysctl_table(net, unix_path, table);
+ net->unx.ctl = register_net_sysctl_table(net, unix_path, unix_table);
if (net->unx.ctl == NULL)
- goto err_reg;
+ return -ENOMEM;

return 0;
-
-err_reg:
- kfree(table);
-err_alloc:
- return -ENOMEM;
}

void unix_sysctl_unregister(struct net *net)
{
- struct ctl_table *table;
-
- table = net->unx.ctl->ctl_table_arg;
unregister_sysctl_table(net->unx.ctl);
- kfree(table);
}
--
1.7.5.rc0


\
 
 \ /
  Last update: 2011-04-02 05:01    [from the cache]
©2003-2011 Jasper Spaans