]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
ipvs: use GFP_KERNEL allocation where possible
authorSasha Levin <levinsasha928@gmail.com>
Sat, 14 Apr 2012 16:37:47 +0000 (12:37 -0400)
committerPablo Neira Ayuso <pablo@netfilter.org>
Tue, 8 May 2012 17:38:22 +0000 (19:38 +0200)
Use GFP_KERNEL instead of GFP_ATOMIC when registering an ipvs protocol.

This is safe since it will always run from a process context.

Signed-off-by: Sasha Levin <levinsasha928@gmail.com>
Acked-by: Julian Anastasov <ja@ssi.bg>
Signed-off-by: Simon Horman <horms@verge.net.au>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
net/netfilter/ipvs/ip_vs_proto.c

index ca16476180819bcf9e6560287f93544e72922076..e91c8982dfac37915953631380fbf02d5c98cb44 100644 (file)
@@ -68,7 +68,7 @@ register_ip_vs_proto_netns(struct net *net, struct ip_vs_protocol *pp)
        struct netns_ipvs *ipvs = net_ipvs(net);
        unsigned int hash = IP_VS_PROTO_HASH(pp->protocol);
        struct ip_vs_proto_data *pd =
-                       kzalloc(sizeof(struct ip_vs_proto_data), GFP_ATOMIC);
+                       kzalloc(sizeof(struct ip_vs_proto_data), GFP_KERNEL);
 
        if (!pd)
                return -ENOMEM;