Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756491Ab1EHXBh (ORCPT ); Sun, 8 May 2011 19:01:37 -0400 Received: from mail-wy0-f174.google.com ([74.125.82.174]:49055 "EHLO mail-wy0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932253Ab1EHWkz (ORCPT ); Sun, 8 May 2011 18:40:55 -0400 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=d4fip/282GPzPxqX6aVi4DlcslIVBu0lT+yxAwfmchktgBdXSzOAfyyHbHEHEjGFBN k46CStMHzPxYgHGKFg2BYLsNct3gbJANyAAVXuz2M/WZiwIsJkUL2l7d2HK1oChTqKNU WyAAKSpQ92Uj0FhqBbSx8x5fwMmoPxSO5z4GY= From: Lucian Adrian Grijincu To: linux-kernel@vger.kernel.org Cc: netdev@vger.kernel.org, Lucian Adrian Grijincu Subject: [v2 023/115] sysctl: remove .child from fs/nfs/ nfs_cb_table Date: Mon, 9 May 2011 00:38:35 +0200 Message-Id: <1304894407-32201-24-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: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1529 Lines: 58 Signed-off-by: Lucian Adrian Grijincu --- fs/nfs/sysctl.c | 22 +++++----------------- 1 files changed, 5 insertions(+), 17 deletions(-) diff --git a/fs/nfs/sysctl.c b/fs/nfs/sysctl.c index 978aaeb..046fe19 100644 --- a/fs/nfs/sysctl.c +++ b/fs/nfs/sysctl.c @@ -21,7 +21,7 @@ static const int nfs_set_port_max = 65535; #endif static struct ctl_table_header *nfs_callback_sysctl_table; -static ctl_table nfs_cb_sysctls[] = { +static ctl_table nfs_cb_table[] = { #ifdef CONFIG_NFS_V4 { .procname = "nfs_callback_tcpport", @@ -59,27 +59,15 @@ static ctl_table nfs_cb_sysctls[] = { { } }; -static ctl_table nfs_cb_sysctl_dir[] = { - { - .procname = "nfs", - .mode = 0555, - .child = nfs_cb_sysctls, - }, - { } -}; - -static ctl_table nfs_cb_sysctl_root[] = { - { - .procname = "fs", - .mode = 0555, - .child = nfs_cb_sysctl_dir, - }, +static const __initdata struct ctl_path nfs_cb_path[] = { + { .procname = "fs" }, + { .procname = "nfs" }, { } }; int nfs_register_sysctl(void) { - nfs_callback_sysctl_table = register_sysctl_table(nfs_cb_sysctl_root); + nfs_callback_sysctl_table = register_sysctl_paths(nfs_cb_path, nfs_cb_table); if (nfs_callback_sysctl_table == NULL) return -ENOMEM; return 0; -- 1.7.5.134.g1c08b -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/