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_ip.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'kernel/ip_set_hash_ip.c') diff --git a/kernel/ip_set_hash_ip.c b/kernel/ip_set_hash_ip.c index 0de26b9..bc0c706 100644 --- a/kernel/ip_set_hash_ip.c +++ b/kernel/ip_set_hash_ip.c @@ -130,7 +130,7 @@ hash_ip4_kadt(struct ip_set *set, const struct sk_buff *skb, if (ip == 0) return -EINVAL; - return adtfn(set, &ip, GFP_ATOMIC, h->timeout); + return adtfn(set, &ip, h->timeout); } static const struct nla_policy @@ -174,7 +174,7 @@ hash_ip4_uadt(struct ip_set *set, struct nlattr *head, int len, } if (adt == IPSET_TEST) - return adtfn(set, &ip, GFP_ATOMIC, timeout); + return adtfn(set, &ip, timeout); ip = ntohl(ip); if (tb[IPSET_ATTR_IP_TO]) { @@ -198,7 +198,7 @@ hash_ip4_uadt(struct ip_set *set, struct nlattr *head, int len, for (; !before(ip_to, ip); ip += hosts) { nip = htonl(ip); - ret = adtfn(set, &nip, GFP_ATOMIC, timeout); + ret = adtfn(set, &nip, timeout); if (ret && !ip_set_eexist(ret, flags)) return ret; @@ -320,7 +320,7 @@ hash_ip6_kadt(struct ip_set *set, const struct sk_buff *skb, if (ipv6_addr_any(&ip.in6)) return -EINVAL; - return adtfn(set, &ip, GFP_ATOMIC, h->timeout); + return adtfn(set, &ip, h->timeout); } static const struct nla_policy @@ -362,7 +362,7 @@ hash_ip6_uadt(struct ip_set *set, struct nlattr *head, int len, timeout = ip_set_timeout_uget(tb[IPSET_ATTR_TIMEOUT]); } - ret = adtfn(set, &ip, GFP_ATOMIC, timeout); + ret = adtfn(set, &ip, timeout); return ip_set_eexist(ret, flags) ? 0 : ret; } -- cgit v1.2.3