From patchwork Sun May 8 22:38:34 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: 94702 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 B9C89B703E for ; Mon, 9 May 2011 09:10:56 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932267Ab1EHXCG (ORCPT ); Sun, 8 May 2011 19:02:06 -0400 Received: from mail-wy0-f174.google.com ([74.125.82.174]:45747 "EHLO mail-wy0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932249Ab1EHWkx (ORCPT ); Sun, 8 May 2011 18:40:53 -0400 Received: by mail-wy0-f174.google.com with SMTP id 21so3497131wya.19 for ; Sun, 08 May 2011 15:40:52 -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; bh=kD/+QE0P/AbxjggM4iVd9rRW74zhAs8pHyjhdrYjA7A=; b=Y1xtzwbNjI1jCJXSP+lfx7Gj8zuIllr0n7T+9aZ4xGhzNawtwQYuZVLb5Zjx8sVq7W be8gYHJm5zBbXx8w3mXnF2VU3xv/FF9rDeXn7rB41ut86Sm2tG0xCN1FhTk05flEeDE2 NOX5l7QVSMhKpVZdqW3jeuhAf4+Ykjt3FNyKQ= 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=aj2yeEzVDR5QigVlq+iwqeLmS2wgEVdV9vVc0zFH6zvpFHaBDfuaoEl0EVXJ/mwYXm vGTevuy2pvFrp9+NKCIU0jw+YEtazoI6DTFpDAfA8IG/cTUr+4CCWSr83w+Ca1CoZOr5 Rp6YgYel6N8v9rmMnoVfztYXvsiBnWxhDdI/E= Received: by 10.227.58.15 with SMTP id e15mr6398961wbh.28.1304894452810; Sun, 08 May 2011 15:40:52 -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 ed10sm3390518wbb.66.2011.05.08.15.40.51 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 08 May 2011 15:40:52 -0700 (PDT) From: Lucian Adrian Grijincu To: linux-kernel@vger.kernel.org Cc: netdev@vger.kernel.org, Lucian Adrian Grijincu Subject: [v2 022/115] sysctl: remove .child from fs/nfs/ nlm_table table Date: Mon, 9 May 2011 00:38:34 +0200 Message-Id: <1304894407-32201-23-git-send-email-lucian.grijincu@gmail.com> X-Mailer: git-send-email 1.7.5.134.g1c08b In-Reply-To: <1304894407-32201-1-git-send-email-lucian.grijincu@gmail.com> References: <1304894407-32201-1-git-send-email-lucian.grijincu@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Signed-off-by: Lucian Adrian Grijincu --- fs/lockd/svc.c | 22 +++++----------------- 1 files changed, 5 insertions(+), 17 deletions(-) diff --git a/fs/lockd/svc.c b/fs/lockd/svc.c index abfff9d..6ab5932 100644 --- a/fs/lockd/svc.c +++ b/fs/lockd/svc.c @@ -355,7 +355,7 @@ EXPORT_SYMBOL_GPL(lockd_down); * Sysctl parameters (same as module parameters, different interface). */ -static ctl_table nlm_sysctls[] = { +static ctl_table nlm_table[] = { { .procname = "nlm_grace_period", .data = &nlm_grace_period, @@ -409,21 +409,9 @@ static ctl_table nlm_sysctls[] = { { } }; -static ctl_table nlm_sysctl_dir[] = { - { - .procname = "nfs", - .mode = 0555, - .child = nlm_sysctls, - }, - { } -}; - -static ctl_table nlm_sysctl_root[] = { - { - .procname = "fs", - .mode = 0555, - .child = nlm_sysctl_dir, - }, +static const __initdata struct ctl_path nlm_path[] = { + { .procname = "fs" }, + { .procname = "nfs" }, { } }; @@ -504,7 +492,7 @@ module_param(nlm_max_connections, uint, 0644); static int __init init_nlm(void) { #ifdef CONFIG_SYSCTL - nlm_sysctl_table = register_sysctl_table(nlm_sysctl_root); + nlm_sysctl_table = register_sysctl_paths(nlm_path, nlm_table); return nlm_sysctl_table ? 0 : -ENOMEM; #else return 0;