treewide: use kv[mz]alloc* rather than opencoded variants

[mirror_ubuntu-artful-kernel.git] / net / ipv4 / tcp_metrics.c

diff --git a/net/ipv4/tcp_metrics.c b/net/ipv4/tcp_metrics.c
index 9d0d4f39e42be15d8ad7389bc7562449b92ea5fa..653bbd67e3a39b68d27d26d17571c00ce2854bfd 100644 (file)
--- a/net/ipv4/tcp_metrics.c
+++ b/net/ipv4/tcp_metrics.c
@@ -1011,10 +1011,7 @@ static int __net_init tcp_net_metrics_init(struct net *net)
        tcp_metrics_hash_log = order_base_2(slots);
        size = sizeof(struct tcpm_hash_bucket) << tcp_metrics_hash_log;
 
-       tcp_metrics_hash = kzalloc(size, GFP_KERNEL | __GFP_NOWARN);
-       if (!tcp_metrics_hash)
-               tcp_metrics_hash = vzalloc(size);
-
+       tcp_metrics_hash = kvzalloc(size, GFP_KERNEL);
        if (!tcp_metrics_hash)
                return -ENOMEM;