From patchwork Sat Apr 2 02:53:26 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lucian Adrian Grijincu X-Patchwork-Id: 89409 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 0C2B5B6FBC for ; Sat, 2 Apr 2011 13:59:01 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755940Ab1DBC6f (ORCPT ); Fri, 1 Apr 2011 22:58:35 -0400 Received: from mail-wy0-f174.google.com ([74.125.82.174]:32917 "EHLO mail-wy0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755476Ab1DBCyi (ORCPT ); Fri, 1 Apr 2011 22:54:38 -0400 Received: by mail-wy0-f174.google.com with SMTP id 21so3431550wya.19 for ; Fri, 01 Apr 2011 19:54:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references:in-reply-to:references; bh=WIsBUiLVCbhDCq3h9B5gVa7CyKoXuHPuoqUk3av9Oh4=; b=JSq5qX4OF6vZA2UkRDrNRlLtZ99M+Pl2K5oNL9gwrvOBvTz5MPagDuF1Mwz8PxwkjC ht0pz3wpYxXMtPlfMGr5aR7Sdr5bBEBSpcH3X1oJm1luDOBdWqsJ784B9a6vAyFoEZkH CA+FupD6JyLQN4EDmWvlpyYc7CEr/xWcUt04k= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; b=JCI+vdh9VzukSwxUf3YWjmymcOArvkoCnZfW7HFqLYI7RF5CFbDEDGmN69lCpg2NaF c70iRuJSe9hVtwvLSasB+3xKdj9yLWLWLpZWUd3KzB7wnuFTFVFOIqQKMC+JMHIrVb+E 4gmfwwl2JX0S43EyUzHhZ5VPjmHUDmlzEYyKI= Received: by 10.216.145.135 with SMTP id p7mr1556185wej.38.1301712877415; Fri, 01 Apr 2011 19:54:37 -0700 (PDT) Received: from localhost.localdomain (aut75-5-82-239-182-128.fbx.proxad.net [82.239.182.128]) by mx.google.com with ESMTPS id e13sm1598638wbi.40.2011.04.01.19.54.35 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 01 Apr 2011 19:54:36 -0700 (PDT) From: Lucian Adrian Grijincu To: "'David S . Miller'" , Alexey Dobriyan , "Eric W . Biederman" , Octavian Purdila , linux-kernel@vger.kernel.org, netdev@vger.kernel.org Cc: Lucian Adrian Grijincu Subject: [PATCH 12/24] sysctl: cookie: share event_sysctl_table between nets Date: Sat, 2 Apr 2011 04:53:26 +0200 Message-Id: <561af9ebd11c312e98bfa237479c251140718740.1301711868.git.lucian.grijincu@gmail.com> X-Mailer: git-send-email 1.7.5.rc0 In-Reply-To: References: In-Reply-To: References: Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Signed-off-by: Lucian Adrian Grijincu --- net/netfilter/nf_conntrack_ecache.c | 30 +++++------------------------- 1 files changed, 5 insertions(+), 25 deletions(-) diff --git a/net/netfilter/nf_conntrack_ecache.c b/net/netfilter/nf_conntrack_ecache.c index 63a1b91..b799e9e 100644 --- a/net/netfilter/nf_conntrack_ecache.c +++ b/net/netfilter/nf_conntrack_ecache.c @@ -163,14 +163,14 @@ static struct ctl_table event_sysctl_table[] = { .data = &init_net.ct.sysctl_events, .maxlen = sizeof(unsigned int), .mode = 0644, - .proc_handler = proc_dointvec, + .proc_handler = netns_proc_dointvec, }, { .procname = "nf_conntrack_events_retry_timeout", .data = &init_net.ct.sysctl_events_retry_timeout, .maxlen = sizeof(unsigned int), .mode = 0644, - .proc_handler = proc_dointvec_jiffies, + .proc_handler = netns_proc_dointvec_jiffies, }, {} }; @@ -185,38 +185,18 @@ static struct nf_ct_ext_type event_extend __read_mostly = { #ifdef CONFIG_SYSCTL static int nf_conntrack_event_init_sysctl(struct net *net) { - struct ctl_table *table; - - table = kmemdup(event_sysctl_table, sizeof(event_sysctl_table), - GFP_KERNEL); - if (!table) - goto out; - - table[0].data = &net->ct.sysctl_events; - table[1].data = &net->ct.sysctl_events_retry_timeout; - - net->ct.event_sysctl_header = - register_net_sysctl_table(net, - nf_net_netfilter_sysctl_path, table); + net->ct.event_sysctl_header = register_net_sysctl_table(net, + nf_net_netfilter_sysctl_path, event_sysctl_table); if (!net->ct.event_sysctl_header) { printk(KERN_ERR "nf_ct_event: can't register to sysctl.\n"); - goto out_register; + return -ENOMEM; } return 0; - -out_register: - kfree(table); -out: - return -ENOMEM; } static void nf_conntrack_event_fini_sysctl(struct net *net) { - struct ctl_table *table; - - table = net->ct.event_sysctl_header->ctl_table_arg; unregister_net_sysctl_table(net->ct.event_sysctl_header); - kfree(table); } #else static int nf_conntrack_event_init_sysctl(struct net *net)