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@xxxxxxxxx>
Signed-off-by: Simon Horman <horms@xxxxxxxxxxxx
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;
>
--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
