fixup for vfs-next vs. net-next
Subsystems (2)
PATCH 1/1 fixup for vfs-next vs. net-next
VServer folks had played with sysctls again; needs to be covered
in sysctl fixes...
Signed-off-by Al Viro <[email protected]>
---
net/sysctl_net.c +1 -8
@@ -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;