diff options
| author | Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> | 2010-12-16 12:34:49 +0100 |
|---|---|---|
| committer | Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> | 2010-12-16 12:34:49 +0100 |
| commit | 5200ad226e7fcbbd069f539c309d17a9e66719af (patch) | |
| tree | 850b74aad437a4b17ccab1fb1848dedba1e4aab2 /kernel/ip_set_bitmap_ipmac.c | |
| parent | 3080a55074a595acdeb5bc85bbcd8dba9fa1bfc2 (diff) | |
Remove unnecessary gfp_flags arguments
Where the argument was used, the set lock was already activated, therefore
the argument value was always GFP_ATOMIC.
Diffstat (limited to 'kernel/ip_set_bitmap_ipmac.c')
| -rw-r--r-- | kernel/ip_set_bitmap_ipmac.c | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/kernel/ip_set_bitmap_ipmac.c b/kernel/ip_set_bitmap_ipmac.c index c838658..9b2c02c 100644 --- a/kernel/ip_set_bitmap_ipmac.c +++ b/kernel/ip_set_bitmap_ipmac.c @@ -102,8 +102,7 @@ bitmap_ipmac_exist(const struct ipmac_telem *elem) /* Base variant */ static int -bitmap_ipmac_test(struct ip_set *set, void *value, - gfp_t gfp_flags, u32 timeout) +bitmap_ipmac_test(struct ip_set *set, void *value, u32 timeout) { const struct bitmap_ipmac *map = set->data; const struct ipmac *data = value; @@ -121,8 +120,7 @@ bitmap_ipmac_test(struct ip_set *set, void *value, } static int -bitmap_ipmac_add(struct ip_set *set, void *value, - gfp_t gfp_flags, u32 timeout) +bitmap_ipmac_add(struct ip_set *set, void *value, u32 timeout) { struct bitmap_ipmac *map = set->data; const struct ipmac *data = value; @@ -151,8 +149,7 @@ bitmap_ipmac_add(struct ip_set *set, void *value, } static int -bitmap_ipmac_del(struct ip_set *set, void *value, - gfp_t gfp_flags, u32 timeout) +bitmap_ipmac_del(struct ip_set *set, void *value, u32 timeout) { struct bitmap_ipmac *map = set->data; const struct ipmac *data = value; @@ -214,8 +211,7 @@ nla_put_failure: /* Timeout variant */ static int -bitmap_ipmac_ttest(struct ip_set *set, void *value, - gfp_t gfp_flags, u32 timeout) +bitmap_ipmac_ttest(struct ip_set *set, void *value, u32 timeout) { const struct bitmap_ipmac *map = set->data; const struct ipmac *data = value; @@ -234,8 +230,7 @@ bitmap_ipmac_ttest(struct ip_set *set, void *value, } static int -bitmap_ipmac_tadd(struct ip_set *set, void *value, - gfp_t gfp_flags, u32 timeout) +bitmap_ipmac_tadd(struct ip_set *set, void *value, u32 timeout) { struct bitmap_ipmac *map = set->data; const struct ipmac *data = value; @@ -277,8 +272,7 @@ bitmap_ipmac_tadd(struct ip_set *set, void *value, } static int -bitmap_ipmac_tdel(struct ip_set *set, void *value, - gfp_t gfp_flags, u32 timeout) +bitmap_ipmac_tdel(struct ip_set *set, void *value, u32 timeout) { struct bitmap_ipmac *map = set->data; const struct ipmac *data = value; @@ -360,7 +354,7 @@ bitmap_ipmac_kadt(struct ip_set *set, const struct sk_buff *skb, data.id -= map->first_ip; data.ether = eth_hdr(skb)->h_source; - return adtfn(set, &data, GFP_ATOMIC, map->timeout); + return adtfn(set, &data, map->timeout); } static const struct nla_policy @@ -410,7 +404,7 @@ bitmap_ipmac_uadt(struct ip_set *set, struct nlattr *head, int len, data.id -= map->first_ip; - ret = adtfn(set, &data, GFP_ATOMIC, timeout); + ret = adtfn(set, &data, timeout); return ip_set_eexist(ret, flags) ? 0 : ret; } |