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: Simon Horman <horms@kernel.org> Reviewed-by: Horatiu Vultur <horatiu.vultur@microchip.com> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
This commit is contained in:
Родитель
e3478c68f6
Коммит
280654932e
|
@ -1481,6 +1481,7 @@ void __net_exit ip_vs_conn_net_cleanup(struct netns_ipvs *ipvs)
|
|||
|
||||
int __init ip_vs_conn_init(void)
|
||||
{
|
||||
size_t tab_array_size;
|
||||
int idx;
|
||||
|
||||
/* Compute size and mask */
|
||||
|
@ -1494,8 +1495,9 @@ int __init ip_vs_conn_init(void)
|
|||
/*
|
||||
* Allocate the connection hash table and initialize its list heads
|
||||
*/
|
||||
ip_vs_conn_tab = vmalloc(array_size(ip_vs_conn_tab_size,
|
||||
sizeof(*ip_vs_conn_tab)));
|
||||
tab_array_size = array_size(ip_vs_conn_tab_size,
|
||||
sizeof(*ip_vs_conn_tab));
|
||||
ip_vs_conn_tab = vmalloc(tab_array_size);
|
||||
if (!ip_vs_conn_tab)
|
||||
return -ENOMEM;
|
||||
|
||||
|
@ -1508,10 +1510,8 @@ int __init ip_vs_conn_init(void)
|
|||
return -ENOMEM;
|
||||
}
|
||||
|
||||
pr_info("Connection hash table configured "
|
||||
"(size=%d, memory=%ldKbytes)\n",
|
||||
ip_vs_conn_tab_size,
|
||||
(long)(ip_vs_conn_tab_size*sizeof(*ip_vs_conn_tab))/1024);
|
||||
pr_info("Connection hash table configured (size=%d, memory=%zdKbytes)\n",
|
||||
ip_vs_conn_tab_size, tab_array_size / 1024);
|
||||
IP_VS_DBG(0, "Each connection entry needs %zd bytes at least\n",
|
||||
sizeof(struct ip_vs_conn));
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче