lkml.org 
[lkml]   [2011]   [Feb]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 8/9] sysctl: ipv6: share ip6_frags_ns_ctl_table between nets
    Date
    Signed-off-by: Lucian Adrian Grijincu <lucian.grijincu@gmail.com>
    ---
    net/ipv6/reassembly.c | 34 ++++++----------------------------
    1 files changed, 6 insertions(+), 28 deletions(-)

    diff --git a/net/ipv6/reassembly.c b/net/ipv6/reassembly.c
    index 07beeb0..868cbd5 100644
    --- a/net/ipv6/reassembly.c
    +++ b/net/ipv6/reassembly.c
    @@ -600,21 +600,21 @@ static struct ctl_table ip6_frags_ns_ctl_table[] = {
    .data = &init_net.ipv6.frags.high_thresh,
    .maxlen = sizeof(int),
    .mode = 0644,
    - .proc_handler = proc_dointvec
    + .proc_handler = (proc_handler *) netns_proc_dointvec,
    },
    {
    .procname = "ip6frag_low_thresh",
    .data = &init_net.ipv6.frags.low_thresh,
    .maxlen = sizeof(int),
    .mode = 0644,
    - .proc_handler = proc_dointvec
    + .proc_handler = (proc_handler *) netns_proc_dointvec,
    },
    {
    .procname = "ip6frag_time",
    .data = &init_net.ipv6.frags.timeout,
    .maxlen = sizeof(int),
    .mode = 0644,
    - .proc_handler = proc_dointvec_jiffies,
    + .proc_handler = (proc_handler *) netns_proc_dointvec_jiffies,
    },
    { }
    };
    @@ -632,42 +632,20 @@ static struct ctl_table ip6_frags_ctl_table[] = {

    static int __net_init ip6_frags_ns_sysctl_register(struct net *net)
    {
    - struct ctl_table *table;
    struct ctl_table_header *hdr;

    - table = ip6_frags_ns_ctl_table;
    - if (!net_eq(net, &init_net)) {
    - table = kmemdup(table, sizeof(ip6_frags_ns_ctl_table), GFP_KERNEL);
    - if (table == NULL)
    - goto err_alloc;
    -
    - table[0].data = &net->ipv6.frags.high_thresh;
    - table[1].data = &net->ipv6.frags.low_thresh;
    - table[2].data = &net->ipv6.frags.timeout;
    - }
    -
    - hdr = register_net_sysctl_table(net, net_ipv6_ctl_path, table);
    + hdr = register_net_sysctl_table(net, net_ipv6_ctl_path,
    + ip6_frags_ns_ctl_table);
    if (hdr == NULL)
    - goto err_reg;
    + return -ENOMEM;

    net->ipv6.sysctl.frags_hdr = hdr;
    return 0;
    -
    -err_reg:
    - if (!net_eq(net, &init_net))
    - kfree(table);
    -err_alloc:
    - return -ENOMEM;
    }

    static void __net_exit ip6_frags_ns_sysctl_unregister(struct net *net)
    {
    - struct ctl_table *table;
    -
    - table = net->ipv6.sysctl.frags_hdr->ctl_table_arg;
    unregister_net_sysctl_table(net->ipv6.sysctl.frags_hdr);
    - if (!net_eq(net, &init_net))
    - kfree(table);
    }

    static struct ctl_table_header *ip6_ctl_header;
    --
    1.7.4.rc1.7.g2cf08.dirty


    \
     
     \ /
      Last update: 2011-02-25 19:57    [W:0.036 / U:32.088 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site