sysctl: Modify __register_sysctl_paths to take a set instead of a root and an nsproxy

An nsproxy argument here has always been awkard and now the nsproxy argument
is completely unnecessary so remove it, replacing it with the set we want
the registered tables to show up in.

Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>

1 files changed, 3 insertions, 7 deletions

diff --git a/net/sysctl_net.c b/net/sysctl_net.c
index e998c6448046..c3e65aebecc0 100644
--- a/net/sysctl_net.c
+++ b/net/sysctl_net.c
@@ -105,19 +105,15 @@ subsys_initcall(net_sysctl_init);
 struct ctl_table_header *register_net_sysctl_table(struct net *net,
         const struct ctl_path *path, struct ctl_table *table)
 {
-        struct nsproxy namespaces;
-        namespaces = *current->nsproxy;
-        namespaces.net_ns = net;
-        return __register_sysctl_paths(&net_sysctl_root,
-                                        &namespaces, path, table);
+        return __register_sysctl_paths(&net->sysctls, path, table);
 }
 EXPORT_SYMBOL_GPL(register_net_sysctl_table);
 
 struct ctl_table_header *register_net_sysctl_rotable(const
                 struct ctl_path *path, struct ctl_table *table)
 {
-        return __register_sysctl_paths(&net_sysctl_ro_root,
-                        &init_nsproxy, path, table);
+        return __register_sysctl_paths(&net_sysctl_ro_root.default_set,
+                                        path, table);
 }
 EXPORT_SYMBOL_GPL(register_net_sysctl_rotable);