LVS
lvs-devel
Google
 
Web LinuxVirtualServer.org

[PATCH 2/2] netfilter: ipvs: use GFP_KERNEL allocation where possible

To: Pablo Neira Ayuso <pablo@xxxxxxxxxxxxx>
Subject: [PATCH 2/2] netfilter: ipvs: use GFP_KERNEL allocation where possible
Cc: lvs-devel@xxxxxxxxxxxxxxx, netdev@xxxxxxxxxxxxxxx, netfilter-devel@xxxxxxxxxxxxxxx, Wensong Zhang <wensong@xxxxxxxxxxxx>, Julian Anastasov <ja@xxxxxx>, Sasha Levin <levinsasha928@xxxxxxxxx>, stable@xxxxxxxxxxxxxxx, Simon Horman <horms@xxxxxxxxxxxx>
From: Simon Horman <horms@xxxxxxxxxxxx>
Date: Mon, 23 Apr 2012 21:17:08 +0900
From: Sasha Levin <levinsasha928@xxxxxxxxx>

Use GFP_KERNEL instead of GFP_ATOMIC when registering an ipvs protocol.

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

Cc: stable@xxxxxxxxxxxxxxx
Signed-off-by: Sasha Levin <levinsasha928@xxxxxxxxx>
Acked-by: Julian Anastasov <ja@xxxxxx>
Signed-off-by: Simon Horman <horms@xxxxxxxxxxxx>
---
 net/netfilter/ipvs/ip_vs_proto.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/netfilter/ipvs/ip_vs_proto.c b/net/netfilter/ipvs/ip_vs_proto.c
index a62360e..307dbbb 100644
--- a/net/netfilter/ipvs/ip_vs_proto.c
+++ b/net/netfilter/ipvs/ip_vs_proto.c
@@ -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 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;
-- 
1.7.9.5

--
To unsubscribe from this list: send the line "unsubscribe lvs-devel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

<Prev in Thread] Current Thread [Next in Thread>