From 5200ad226e7fcbbd069f539c309d17a9e66719af Mon Sep 17 00:00:00 2001 From: Jozsef Kadlecsik Date: Thu, 16 Dec 2010 12:34:49 +0100 Subject: Remove unnecessary gfp_flags arguments Where the argument was used, the set lock was already activated, therefore the argument value was always GFP_ATOMIC. --- kernel/ip_set_hash_ipportip.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'kernel/ip_set_hash_ipportip.c') diff --git a/kernel/ip_set_hash_ipportip.c b/kernel/ip_set_hash_ipportip.c index 37a09f8..53c9e7a 100644 --- a/kernel/ip_set_hash_ipportip.c +++ b/kernel/ip_set_hash_ipportip.c @@ -155,7 +155,7 @@ hash_ipportip4_kadt(struct ip_set *set, const struct sk_buff *skb, ip4addrptr(skb, flags & IPSET_DIM_ONE_SRC, &data.ip); ip4addrptr(skb, flags & IPSET_DIM_THREE_SRC, &data.ip2); - return adtfn(set, &data, GFP_ATOMIC, h->timeout); + return adtfn(set, &data, h->timeout); } static const struct nla_policy @@ -223,7 +223,7 @@ hash_ipportip4_uadt(struct ip_set *set, struct nlattr *head, int len, timeout = ip_set_timeout_uget(tb[IPSET_ATTR_TIMEOUT]); } - ret = adtfn(set, &data, GFP_ATOMIC, timeout); + ret = adtfn(set, &data, timeout); return ip_set_eexist(ret, flags) ? 0 : ret; } @@ -353,7 +353,7 @@ hash_ipportip6_kadt(struct ip_set *set, const struct sk_buff *skb, ip6addrptr(skb, flags & IPSET_DIM_ONE_SRC, &data.ip.in6); ip6addrptr(skb, flags & IPSET_DIM_THREE_SRC, &data.ip2.in6); - return adtfn(set, &data, GFP_ATOMIC, h->timeout); + return adtfn(set, &data, h->timeout); } static int @@ -411,7 +411,7 @@ hash_ipportip6_uadt(struct ip_set *set, struct nlattr *head, int len, timeout = ip_set_timeout_uget(tb[IPSET_ATTR_TIMEOUT]); } - ret = adtfn(set, &data, GFP_ATOMIC, timeout); + ret = adtfn(set, &data, timeout); return ip_set_eexist(ret, flags) ? 0 : ret; } -- cgit v1.2.3