writeback: ensure that WB_SYNC_NONE writeback with sb pinned is sync

[safe/jmp/linux-2.6] / net / core / sysctl_net_core.c

diff --git a/net/core/sysctl_net_core.c b/net/core/sysctl_net_core.c
index 1ce4e6e..b7b6b82 100644 (file)
--- a/net/core/sysctl_net_core.c
+++ b/net/core/sysctl_net_core.c
@@ -10,7 +10,10 @@
 #include <linux/module.h>
 #include <linux/socket.h>
 #include <linux/netdevice.h>
+#include <linux/ratelimit.h>
 #include <linux/init.h>
+#include <linux/slab.h>
+
 #include <net/ip.h>
 #include <net/sock.h>
 
@@ -121,7 +124,7 @@ static __net_init int sysctl_core_net_init(struct net *net)
        net->core.sysctl_somaxconn = SOMAXCONN;
 
        tbl = netns_core_table;
-       if (net != &init_net) {
+       if (!net_eq(net, &init_net)) {
                tbl = kmemdup(tbl, sizeof(netns_core_table), GFP_KERNEL);
                if (tbl == NULL)
                        goto err_dup;