From patchwork Sat Apr 2 02:53:28 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: 89405 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 7FF06B6F8B for ; Sat, 2 Apr 2011 13:58:12 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756973Ab1DBC5u (ORCPT ); Fri, 1 Apr 2011 22:57:50 -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 S1756041Ab1DBCyn (ORCPT ); Fri, 1 Apr 2011 22:54:43 -0400 Received: by mail-wy0-f174.google.com with SMTP id 21so3431550wya.19 for ; Fri, 01 Apr 2011 19:54:42 -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=LT0qulhyo4FeP4UMhkNq+sNMDfRQHUmOpFQfYBA2f2g=; b=aOIAl0+9oJa4CuGLGd+DTVWX0XnhaW+CcU2+s/val9/1NnGW7RVThd2Q7MWPZjaTJL X9R4SXvdnJ2REhqawiovqpNcmWT2AbNYacxsdvDztzHqyFes5EsgefJGYsrjw/nb0iBw U72n7D+CaZuvnRcKmD3YNfOIBof7Cd4wx+DqE= 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=UNI4j/SVkSzCcEO5wYqj5aG6zxmawvWt1NuqLmoHKZE28ZixAwo1mpo1dfn2ds060C TkAtrIv/WWs70IsoeR/8BQ7tQS3brcV/GYHbbjM8BzJO4rT4jfl0bEWLq+LjRb+YOaGf 3JEM8yRsKiHpxq5WSut/vpqZBUUEl+BRN5qJc= Received: by 10.227.197.201 with SMTP id el9mr4773683wbb.22.1301712882208; Fri, 01 Apr 2011 19:54:42 -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.40 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 01 Apr 2011 19:54:41 -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 14/24] sysctl: cookie: share unix_table between nets Date: Sat, 2 Apr 2011 04:53:28 +0200 Message-Id: <08df352d32bf9a8f1ce37b6ccb5d4d610af21757.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/unix/sysctl_net_unix.c | 22 +++------------------- 1 files changed, 3 insertions(+), 19 deletions(-) diff --git a/net/unix/sysctl_net_unix.c b/net/unix/sysctl_net_unix.c index 397cffe..d514f62 100644 --- a/net/unix/sysctl_net_unix.c +++ b/net/unix/sysctl_net_unix.c @@ -21,7 +21,7 @@ static ctl_table unix_table[] = { .data = &init_net.unx.sysctl_max_dgram_qlen, .maxlen = sizeof(int), .mode = 0644, - .proc_handler = proc_dointvec + .proc_handler = netns_proc_dointvec, }, { } }; @@ -34,30 +34,14 @@ static struct ctl_path unix_path[] = { int __net_init unix_sysctl_register(struct net *net) { - struct ctl_table *table; - - table = kmemdup(unix_table, sizeof(unix_table), GFP_KERNEL); - if (table == NULL) - goto err_alloc; - - table[0].data = &net->unx.sysctl_max_dgram_qlen; - net->unx.ctl = register_net_sysctl_table(net, unix_path, table); + net->unx.ctl = register_net_sysctl_table(net, unix_path, unix_table); if (net->unx.ctl == NULL) - goto err_reg; + return -ENOMEM; return 0; - -err_reg: - kfree(table); -err_alloc: - return -ENOMEM; } void unix_sysctl_unregister(struct net *net) { - struct ctl_table *table; - - table = net->unx.ctl->ctl_table_arg; unregister_sysctl_table(net->unx.ctl); - kfree(table); }