Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dee06e47 authored by Simon Horman's avatar Simon Horman Committed by David S. Miller
Browse files

ipvs: switch to GFP_KERNEL allocations 



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: default avatarEric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: default avatarSimon Horman <horms@verge.net.au>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4f72816e

net/netfilter/ipvs/ip_vs_ctl.c

+2 −2
Original line number Diff line number Diff line
@@ -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;