leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ipvs: switch to GFP_KERNEL allocations

Browse Source 
Switch from GFP_ATOMIC allocations to GFP_KERNEL ones in
ip_vs_add_service() and ip_vs_new_dest(), as we hold a mutex and are
allowed to sleep in this context.

Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: Simon Horman <horms@verge.net.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Simon Horman 2010-08-26 02:54:31 +00:00 committed by David S. Miller
parent 4f72816ef0
commit dee06e4702
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
net/netfilter/ipvs/ip_vs_ctl.c
View File

@ -843,7 +843,7 @@ ip_vs_new_dest(struct ip_vs_service *svc, struct ip_vs_dest_user_kern *udest,
return -EINVAL; return -EINVAL;
} }
dest = kzalloc(sizeof(struct ip_vs_dest), GFP_ATOMIC); dest = kzalloc(sizeof(struct ip_vs_dest), GFP_KERNEL);
if (dest == NULL) { if (dest == NULL) {
pr_err("%s(): no memory.\n", __func__); pr_err("%s(): no memory.\n", __func__);
return -ENOMEM; return -ENOMEM;
@ -1177,7 +1177,7 @@ ip_vs_add_service(struct ip_vs_service_user_kern *u,
} }
#endif #endif
svc = kzalloc(sizeof(struct ip_vs_service), GFP_ATOMIC); svc = kzalloc(sizeof(struct ip_vs_service), GFP_KERNEL);
if (svc == NULL) { if (svc == NULL) {
IP_VS_DBG(1, "%s(): no memory\n", __func__); IP_VS_DBG(1, "%s(): no memory\n", __func__);
ret = -ENOMEM; ret = -ENOMEM;