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/include/linux/netfilter/ipset/ip_set.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'kernel/include/linux/netfilter/ipset/ip_set.h') diff --git a/kernel/include/linux/netfilter/ipset/ip_set.h b/kernel/include/linux/netfilter/ipset/ip_set.h index 1e18b14..df144cc 100644 --- a/kernel/include/linux/netfilter/ipset/ip_set.h +++ b/kernel/include/linux/netfilter/ipset/ip_set.h @@ -214,8 +214,7 @@ enum ip_set_feature { struct ip_set; -typedef int (*ipset_adtfn)(struct ip_set *set, void *value, - gfp_t gfp_flags, u32 timeout); +typedef int (*ipset_adtfn)(struct ip_set *set, void *value, u32 timeout); /* Set type, variant-specific part */ struct ip_set_type_variant { @@ -231,7 +230,7 @@ struct ip_set_type_variant { ipset_adtfn adt[IPSET_ADT_MAX]; /* When adding entries and set is full, try to resize the set */ - int (*resize)(struct ip_set *set, gfp_t gfp_flags, bool retried); + int (*resize)(struct ip_set *set, bool retried); /* Destroy the set */ void (*destroy)(struct ip_set *set); /* Flush the elements */ -- cgit v1.2.3