From patchwork Sat Apr 2 02:53:21 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: 89412 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 C4710B6F7C for ; Sat, 2 Apr 2011 14:00:05 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754948Ab1DBC7q (ORCPT ); Fri, 1 Apr 2011 22:59:46 -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 S1754857Ab1DBCyZ (ORCPT ); Fri, 1 Apr 2011 22:54:25 -0400 Received: by mail-wy0-f174.google.com with SMTP id 21so3431550wya.19 for ; Fri, 01 Apr 2011 19:54:24 -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=Y7AgMVXD5QG/dEzi4GYPAeLREvGqtVKPPsJliM3ions=; b=aWpo+zcgyFfw4hqq02eWUshi6M9bbB4vBqWMnFSSJ+htx6bNdeu2sMQOWxdBXNmrgp o5JlLVJ3ssol1ombCjiFzM504g688bloX6/tnRAI2mVzf+CH0RYVywGyddd0aZ1I9yNN oyCRgnq5OTI3cRJcbCQCJ6PU1ejBce8g2hcEY= 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=PUaYliTVNMVblFYNASyvJB4QxfhxSofGimNkqvflu30KIIeiqe0CrnaNKpqoqorlBx H74WjubQNB/Si7hxGgyEyDtbHko+jXFOT2ebkbNWeeoreu42t5KurPJdakKMNiCVC7Sh to8b6o7deAT4P1/cQCN2cDVl+twl2Pd1CaOyw= Received: by 10.216.11.205 with SMTP id 55mr1465494wex.72.1301712864711; Fri, 01 Apr 2011 19:54:24 -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.22 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 01 Apr 2011 19:54:23 -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 07/24] sysctl: cookie: share ipv4_route_flush_table between nets Date: Sat, 2 Apr 2011 04:53:21 +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/ipv4/route.c | 30 ++++-------------------------- 1 files changed, 4 insertions(+), 26 deletions(-) diff --git a/net/ipv4/route.c b/net/ipv4/route.c index 0c66ea6..1e99f01 100644 --- a/net/ipv4/route.c +++ b/net/ipv4/route.c @@ -3015,13 +3015,12 @@ static int ipv4_sysctl_rtcache_flush(ctl_table *__ctl, int write, if (write) { int flush_delay; ctl_table ctl; - struct net *net; + struct net *net = (struct net *) cookie; memcpy(&ctl, __ctl, sizeof(ctl)); ctl.data = &flush_delay; proc_dointvec(&ctl, write, buffer, lenp, ppos, NULL); - net = (struct net *)__ctl->extra1; rt_cache_flush(net, flush_delay); return 0; } @@ -3176,37 +3175,16 @@ static __net_initdata struct ctl_path ipv4_route_path[] = { static __net_init int sysctl_route_net_init(struct net *net) { - struct ctl_table *tbl; - - tbl = ipv4_route_flush_table; - if (!net_eq(net, &init_net)) { - tbl = kmemdup(tbl, sizeof(ipv4_route_flush_table), GFP_KERNEL); - if (tbl == NULL) - goto err_dup; - } - tbl[0].extra1 = net; - - net->ipv4.route_hdr = - register_net_sysctl_table(net, ipv4_route_path, tbl); + net->ipv4.route_hdr = register_net_sysctl_table(net, + ipv4_route_path, ipv4_route_flush_table); if (net->ipv4.route_hdr == NULL) - goto err_reg; + return -ENOMEM; return 0; - -err_reg: - if (tbl != ipv4_route_flush_table) - kfree(tbl); -err_dup: - return -ENOMEM; } static __net_exit void sysctl_route_net_exit(struct net *net) { - struct ctl_table *tbl; - - tbl = net->ipv4.route_hdr->ctl_table_arg; unregister_net_sysctl_table(net->ipv4.route_hdr); - BUG_ON(tbl == ipv4_route_flush_table); - kfree(tbl); } static __net_initdata struct pernet_operations sysctl_route_ops = {