From mboxrd@z Thu Jan 1 00:00:00 1970 From: Al Viro Subject: [PATCH] fixup for vfs-next vs. net-next Date: Sat, 19 Jul 2008 01:01:17 +0100 Message-ID: <20080719000117.GS28946@ZenIV.linux.org.uk> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from zeniv.linux.org.uk ([195.92.253.2]:39894 "EHLO ZenIV.linux.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753493AbYGSABU (ORCPT ); Fri, 18 Jul 2008 20:01:20 -0400 Content-Disposition: inline Sender: linux-next-owner@vger.kernel.org List-ID: To: Stephen Rothwell Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, David Miller VServer folks had played with sysctls again; needs to be covered in sysctl fixes... Signed-off-by: Al Viro --- diff --git a/net/sysctl_net.c b/net/sysctl_net.c index b91a5de..2240a9e 100644 --- a/net/sysctl_net.c +++ b/net/sysctl_net.c @@ -44,13 +44,6 @@ static struct ctl_table_root net_sysctl_root = { .lookup = net_ctl_header_lookup, }; -static LIST_HEAD(net_sysctl_ro_tables); -static struct list_head *net_ctl_ro_header_lookup(struct ctl_table_root *root, - struct nsproxy *namespaces) -{ - return &net_sysctl_ro_tables; -} - static int net_ctl_ro_header_perms(struct ctl_table_root *root, struct nsproxy *namespaces, struct ctl_table *table) { @@ -61,7 +54,6 @@ static int net_ctl_ro_header_perms(struct ctl_table_root *root, } static struct ctl_table_root net_sysctl_ro_root = { - .lookup = net_ctl_ro_header_lookup, .permissions = net_ctl_ro_header_perms, }; @@ -89,6 +81,7 @@ static __init int sysctl_init(void) if (ret) goto out; register_sysctl_root(&net_sysctl_root); + setup_sysctl_set(&net_sysctl_ro_root.default_set, NULL, NULL); register_sysctl_root(&net_sysctl_ro_root); out: return ret;