From patchwork Sat Apr 2 02:53:20 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: 89411 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 5B351B6F7C for ; Sat, 2 Apr 2011 13:59:47 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754890Ab1DBCy0 (ORCPT ); Fri, 1 Apr 2011 22:54:26 -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 S1754312Ab1DBCyW (ORCPT ); Fri, 1 Apr 2011 22:54:22 -0400 Received: by mail-ww0-f44.google.com with SMTP id 36so4731035wwa.1 for ; Fri, 01 Apr 2011 19:54:21 -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=+CQmZkq1o5yKKwThvMSLDP+kWwQ+w+BHdZD3Mij9VNE=; b=nZweKttTAYBt7z9+wf8ituhiZ7P0XCKxQ0tDuHF+z4htVk7Dyh30bYUQ1lzi7+kgQT E/8Wamge5tEB51o8TNcZBqIFD96ULSTmACEkKBrHDi4jGqlCNXWW2ET1nT2kHb+qQ4+W zdxIsma1KQ1nRp0whJ9fnDWfLXexOjRI+I1/Y= 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=KKfc0upll2y7AQyLFM9BXm3qleHdk6qJvkJi8HieotUl8m1oo7Lrl7v7qQffaKHMch qOkvesbu8KzeyB41QUpYtWe3JTbh2cdvI0CRoZCYtg/ue6QhDJNLwhs029zyAyXUM/p6 fACWrmp7l+pdzCtvwBHzBkZ9duvRF5y4eq4K4= Received: by 10.216.12.146 with SMTP id 18mr1476493wez.63.1301712861643; Fri, 01 Apr 2011 19:54:21 -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.20 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 01 Apr 2011 19:54:20 -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 06/24] sysctl: cookie: share netns_core_table between nets Date: Sat, 2 Apr 2011 04:53:20 +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/core/sysctl_net_core.c | 28 +++------------------------- 1 files changed, 3 insertions(+), 25 deletions(-) diff --git a/net/core/sysctl_net_core.c b/net/core/sysctl_net_core.c index 923ae0f..c4571cc 100644 --- a/net/core/sysctl_net_core.c +++ b/net/core/sysctl_net_core.c @@ -183,7 +183,7 @@ static struct ctl_table netns_core_table[] = { .data = &init_net.core.sysctl_somaxconn, .maxlen = sizeof(int), .mode = 0644, - .proc_handler = proc_dointvec + .proc_handler = netns_proc_dointvec, }, { } }; @@ -196,41 +196,19 @@ __net_initdata struct ctl_path net_core_path[] = { static __net_init int sysctl_core_net_init(struct net *net) { - struct ctl_table *tbl; - net->core.sysctl_somaxconn = SOMAXCONN; - tbl = netns_core_table; - if (!net_eq(net, &init_net)) { - tbl = kmemdup(tbl, sizeof(netns_core_table), GFP_KERNEL); - if (tbl == NULL) - goto err_dup; - - tbl[0].data = &net->core.sysctl_somaxconn; - } - net->core.sysctl_hdr = register_net_sysctl_table(net, - net_core_path, tbl); + net_core_path, netns_core_table); if (net->core.sysctl_hdr == NULL) - goto err_reg; + return -ENOMEM; return 0; - -err_reg: - if (tbl != netns_core_table) - kfree(tbl); -err_dup: - return -ENOMEM; } static __net_exit void sysctl_core_net_exit(struct net *net) { - struct ctl_table *tbl; - - tbl = net->core.sysctl_hdr->ctl_table_arg; unregister_net_sysctl_table(net->core.sysctl_hdr); - BUG_ON(tbl == netns_core_table); - kfree(tbl); } static __net_initdata struct pernet_operations sysctl_core_ops = {