From patchwork Sat Apr 2 02:53:23 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: 89410 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 9BDC6B6F7C for ; Sat, 2 Apr 2011 13:59:21 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757022Ab1DBC7E (ORCPT ); Fri, 1 Apr 2011 22:59:04 -0400 Received: from mail-ww0-f44.google.com ([74.125.82.44]:40187 "EHLO mail-ww0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755111Ab1DBCya (ORCPT ); Fri, 1 Apr 2011 22:54:30 -0400 Received: by mail-ww0-f44.google.com with SMTP id 36so4731035wwa.1 for ; Fri, 01 Apr 2011 19:54:29 -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=OMNsaWXAH+5MZGDRVZev/lbHaqA8mVBnMXxUNVf8VGk=; b=NDGB+wSUtTEXyrq0Iz7G/YtBA2sQ5lDGlD1fTSpbHJwP7sTapiSPMz0qn+bKP302Bo FC20ToylYimR53vXS6Y7ssVcF/HF0sAN6ImKrX51DN88KRdom6kkdBsszIbSA+XCRjLF 57DqsMwjqeRREhbFeRNYzXwlxf/fTncgXILto= 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=dUzGUP8Fx+lut1yPeINouRNxcroHVkwz/awe5rxXmkxz1MFbJYDy6X5hH8MJ8mr8KO Ger330n7NPGe72PLFVrlrFeZZxErUER89f0wyJB+dri9nOBFSV/dVjPeqMa2VtXN7kEc O9QVRKF4TpAK0AgJinvNOjNUGRdKS+ZFwTKEk= Received: by 10.227.61.16 with SMTP id r16mr4697810wbh.24.1301712869912; Fri, 01 Apr 2011 19:54:29 -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.28 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 01 Apr 2011 19:54:29 -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 09/24] sysctl: cookie: share ip6_frags_ns_ctl_table between nets Date: Sat, 2 Apr 2011 04:53:23 +0200 Message-Id: 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/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..405dc11 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 = 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 = netns_proc_dointvec, }, { .procname = "ip6frag_time", .data = &init_net.ipv6.frags.timeout, .maxlen = sizeof(int), .mode = 0644, - .proc_handler = proc_dointvec_jiffies, + .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;