Commit 28065493 authored by Simon Horman's avatar Simon Horman Committed by Pablo Neira Ayuso

ipvs: Consistently use array_size() in ip_vs_conn_init()

Consistently use array_size() to calculate the size of ip_vs_conn_tab
in bytes.

Flagged by Coccinelle:
 WARNING: array_size is already used (line 1498) to compute the same size

No functional change intended.
Compile tested only.
Signed-off-by: default avatarSimon Horman <horms@kernel.org>
Reviewed-by: default avatarHoratiu Vultur <horatiu.vultur@microchip.com>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent e3478c68
...@@ -1481,6 +1481,7 @@ void __net_exit ip_vs_conn_net_cleanup(struct netns_ipvs *ipvs) ...@@ -1481,6 +1481,7 @@ void __net_exit ip_vs_conn_net_cleanup(struct netns_ipvs *ipvs)
int __init ip_vs_conn_init(void) int __init ip_vs_conn_init(void)
{ {
size_t tab_array_size;
int idx; int idx;
/* Compute size and mask */ /* Compute size and mask */
...@@ -1494,8 +1495,9 @@ int __init ip_vs_conn_init(void) ...@@ -1494,8 +1495,9 @@ int __init ip_vs_conn_init(void)
/* /*
* Allocate the connection hash table and initialize its list heads * Allocate the connection hash table and initialize its list heads
*/ */
ip_vs_conn_tab = vmalloc(array_size(ip_vs_conn_tab_size, tab_array_size = array_size(ip_vs_conn_tab_size,
sizeof(*ip_vs_conn_tab))); sizeof(*ip_vs_conn_tab));
ip_vs_conn_tab = vmalloc(tab_array_size);
if (!ip_vs_conn_tab) if (!ip_vs_conn_tab)
return -ENOMEM; return -ENOMEM;
...@@ -1508,10 +1510,8 @@ int __init ip_vs_conn_init(void) ...@@ -1508,10 +1510,8 @@ int __init ip_vs_conn_init(void)
return -ENOMEM; return -ENOMEM;
} }
pr_info("Connection hash table configured " pr_info("Connection hash table configured (size=%d, memory=%zdKbytes)\n",
"(size=%d, memory=%ldKbytes)\n", ip_vs_conn_tab_size, tab_array_size / 1024);
ip_vs_conn_tab_size,
(long)(ip_vs_conn_tab_size*sizeof(*ip_vs_conn_tab))/1024);
IP_VS_DBG(0, "Each connection entry needs %zd bytes at least\n", IP_VS_DBG(0, "Each connection entry needs %zd bytes at least\n",
sizeof(struct ip_vs_conn)); sizeof(struct ip_vs_conn));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment