NFS: Don't use GFP_KERNEL in rpcsec_gss downcalls

[safe/jmp/linux-2.6] / net / sysctl_net.c

diff --git a/net/sysctl_net.c b/net/sysctl_net.c
index cefbc36..5319600 100644 (file)
--- a/net/sysctl_net.c
+++ b/net/sysctl_net.c
@@ -61,7 +61,7 @@ static struct ctl_table_root net_sysctl_root = {
 static int net_ctl_ro_header_perms(struct ctl_table_root *root,
                struct nsproxy *namespaces, struct ctl_table *table)
 {
-       if (namespaces->net_ns == &init_net)
+       if (net_eq(namespaces->net_ns, &init_net))
                return table->mode;
        else
                return table->mode & ~0222;
@@ -71,13 +71,15 @@ static struct ctl_table_root net_sysctl_ro_root = {
        .permissions = net_ctl_ro_header_perms,
 };
 
-static int sysctl_net_init(struct net *net)
+static int __net_init sysctl_net_init(struct net *net)
 {
-       setup_sysctl_set(&net->sysctls, NULL, is_seen);
+       setup_sysctl_set(&net->sysctls,
+                        &net_sysctl_ro_root.default_set,
+                        is_seen);
        return 0;
 }
 
-static void sysctl_net_exit(struct net *net)
+static void __net_exit sysctl_net_exit(struct net *net)
 {
        WARN_ON(!list_empty(&net->sysctls.list));
        return;