From patchwork Wed May 2 01:24:51 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Horman X-Patchwork-Id: 156311 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40EC2B6FAC for ; Wed, 2 May 2012 11:26:43 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756801Ab2EBB0Z (ORCPT ); Tue, 1 May 2012 21:26:25 -0400 Received: from kirsty.vergenet.net ([202.4.237.240]:59926 "EHLO kirsty.vergenet.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757586Ab2EBBZZ (ORCPT ); Tue, 1 May 2012 21:25:25 -0400 Received: from ayumi.akashicho.tokyo.vergenet.net (p5238-ipbfp903kobeminato.hyogo.ocn.ne.jp [123.221.44.238]) by kirsty.vergenet.net (Postfix) with ESMTP id 20AB926715F; Wed, 2 May 2012 11:25:23 +1000 (EST) Received: by ayumi.akashicho.tokyo.vergenet.net (Postfix, from userid 7100) id 031E16D2D77; Wed, 2 May 2012 10:25:21 +0900 (JST) From: Simon Horman To: Pablo Neira Ayuso Cc: lvs-devel@vger.kernel.org, netdev@vger.kernel.org, netfilter-devel@vger.kernel.org, Wensong Zhang , Julian Anastasov , Hans Schillstrom , Jesper Dangaard Brouer , Sasha Levin , Simon Horman Subject: [PATCH 07/17] netfilter: ipvs: use GFP_KERNEL allocation where possible Date: Wed, 2 May 2012 10:24:51 +0900 Message-Id: <1335921901-21284-8-git-send-email-horms@verge.net.au> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1335921901-21284-1-git-send-email-horms@verge.net.au> References: <1335921901-21284-1-git-send-email-horms@verge.net.au> Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org From: Sasha Levin 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 Acked-by: Julian Anastasov Signed-off-by: Simon Horman --- 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 a981b7c..8726488 100644 --- a/net/netfilter/ipvs/ip_vs_proto.c +++ b/net/netfilter/ipvs/ip_vs_proto.c @@ -71,7 +71,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;