* [PATCH net-next-2.6] ipvs: switch to GFP_KERNEL allocations
@ 2010-08-24 5:51 Eric Dumazet
2010-08-24 6:00 ` Simon Horman
0 siblings, 1 reply; 2+ messages in thread
From: Eric Dumazet @ 2010-08-24 5:51 UTC (permalink / raw)
To: Simon Horman; +Cc: netdev, Netfilter Development Mailinglist
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>
---
net/netfilter/ipvs/ip_vs_ctl.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/net/netfilter/ipvs/ip_vs_ctl.c b/net/netfilter/ipvs/ip_vs_ctl.c
index 0f0c079..896f34b 100644
--- a/net/netfilter/ipvs/ip_vs_ctl.c
+++ b/net/netfilter/ipvs/ip_vs_ctl.c
@@ -843,7 +843,7 @@ ip_vs_new_dest(struct ip_vs_service *svc, struct ip_vs_dest_user_kern *udest,
return -EINVAL;
}
- dest = kzalloc(sizeof(struct ip_vs_dest), GFP_ATOMIC);
+ dest = kzalloc(sizeof(struct ip_vs_dest), GFP_KERNEL);
if (dest == NULL) {
pr_err("%s(): no memory.\n", __func__);
return -ENOMEM;
@@ -1177,7 +1177,7 @@ ip_vs_add_service(struct ip_vs_service_user_kern *u,
}
#endif
- svc = kzalloc(sizeof(struct ip_vs_service), GFP_ATOMIC);
+ svc = kzalloc(sizeof(struct ip_vs_service), GFP_KERNEL);
if (svc == NULL) {
IP_VS_DBG(1, "%s(): no memory\n", __func__);
ret = -ENOMEM;
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH net-next-2.6] ipvs: switch to GFP_KERNEL allocations
2010-08-24 5:51 [PATCH net-next-2.6] ipvs: switch to GFP_KERNEL allocations Eric Dumazet
@ 2010-08-24 6:00 ` Simon Horman
0 siblings, 0 replies; 2+ messages in thread
From: Simon Horman @ 2010-08-24 6:00 UTC (permalink / raw)
To: Eric Dumazet; +Cc: netdev, Netfilter Development Mailinglist, Patrick McHardy
On Tue, Aug 24, 2010 at 07:51:38AM +0200, Eric Dumazet wrote:
> 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
Patrick, please consider this for nf-next.
> ---
> net/netfilter/ipvs/ip_vs_ctl.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/net/netfilter/ipvs/ip_vs_ctl.c b/net/netfilter/ipvs/ip_vs_ctl.c
> index 0f0c079..896f34b 100644
> --- a/net/netfilter/ipvs/ip_vs_ctl.c
> +++ b/net/netfilter/ipvs/ip_vs_ctl.c
> @@ -843,7 +843,7 @@ ip_vs_new_dest(struct ip_vs_service *svc, struct ip_vs_dest_user_kern *udest,
> return -EINVAL;
> }
>
> - dest = kzalloc(sizeof(struct ip_vs_dest), GFP_ATOMIC);
> + dest = kzalloc(sizeof(struct ip_vs_dest), GFP_KERNEL);
> if (dest == NULL) {
> pr_err("%s(): no memory.\n", __func__);
> return -ENOMEM;
> @@ -1177,7 +1177,7 @@ ip_vs_add_service(struct ip_vs_service_user_kern *u,
> }
> #endif
>
> - svc = kzalloc(sizeof(struct ip_vs_service), GFP_ATOMIC);
> + svc = kzalloc(sizeof(struct ip_vs_service), GFP_KERNEL);
> if (svc == NULL) {
> IP_VS_DBG(1, "%s(): no memory\n", __func__);
> ret = -ENOMEM;
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-08-24 6:00 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-08-24 5:51 [PATCH net-next-2.6] ipvs: switch to GFP_KERNEL allocations Eric Dumazet
2010-08-24 6:00 ` Simon Horman
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox