* [PATCH 1/3] netfilter: ipset: use setup_timer() and mod_timer().
@ 2016-05-13 20:58 Muhammad Falak R Wani
2016-05-13 20:58 ` [PATCH 2/3] " Muhammad Falak R Wani
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Muhammad Falak R Wani @ 2016-05-13 20:58 UTC (permalink / raw)
To: David S. Miller
Cc: Pablo Neira Ayuso, Patrick McHardy, Jozsef Kadlecsik,
Vishwanath Pai, Joshua Hunt, netfilter-devel, coreteam, netdev,
linux-kernel
Use setup_timer() and instead of init_timer(), being the preferred way
of setting up a timer.
Also, quoting the mod_timer() function comment:
-> mod_timer() is a more efficient way to update the expire field of an
active timer (if the timer is inactive it will be activated).
Use setup_timer() and mod_timer() to setup and arm a timer, making the
code compact and easier to read.
Signed-off-by: Muhammad Falak R Wani <falakreyaz@gmail.com>
---
net/netfilter/ipset/ip_set_bitmap_gen.h | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/net/netfilter/ipset/ip_set_bitmap_gen.h b/net/netfilter/ipset/ip_set_bitmap_gen.h
index 2e8e7e5..29ae5d8 100644
--- a/net/netfilter/ipset/ip_set_bitmap_gen.h
+++ b/net/netfilter/ipset/ip_set_bitmap_gen.h
@@ -40,11 +40,8 @@ mtype_gc_init(struct ip_set *set, void (*gc)(unsigned long ul_set))
{
struct mtype *map = set->data;
- init_timer(&map->gc);
- map->gc.data = (unsigned long)set;
- map->gc.function = gc;
- map->gc.expires = jiffies + IPSET_GC_PERIOD(set->timeout) * HZ;
- add_timer(&map->gc);
+ setup_timer(&map->gc, gc, (unsigned long)set);
+ mod_timer(&map->gc, jiffies + IPSET_GC_PERIOD(set->timeout) * HZ);
}
static void
--
1.9.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 2/3] netfilter: ipset: use setup_timer() and mod_timer().
2016-05-13 20:58 [PATCH 1/3] netfilter: ipset: use setup_timer() and mod_timer() Muhammad Falak R Wani
@ 2016-05-13 20:58 ` Muhammad Falak R Wani
2016-05-13 20:58 ` [PATCH 3/3] " Muhammad Falak R Wani
2016-05-20 20:40 ` [PATCH 1/3] " Jozsef Kadlecsik
2 siblings, 0 replies; 4+ messages in thread
From: Muhammad Falak R Wani @ 2016-05-13 20:58 UTC (permalink / raw)
To: David S. Miller
Cc: Pablo Neira Ayuso, Patrick McHardy, Jozsef Kadlecsik,
Joshua Hunt, Sergey Popovich, Vishwanath Pai, netfilter-devel,
coreteam, netdev, linux-kernel
Use setup_timer() and instead of init_timer(), being the preferred way
of setting up a timer.
Also, quoting the mod_timer() function comment:
-> mod_timer() is a more efficient way to update the expire field of an
active timer (if the timer is inactive it will be activated).
Use setup_timer() and mod_timer() to setup and arm a timer, making the
code compact and easier to read.
Signed-off-by: Muhammad Falak R Wani <falakreyaz@gmail.com>
---
net/netfilter/ipset/ip_set_hash_gen.h | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/net/netfilter/ipset/ip_set_hash_gen.h b/net/netfilter/ipset/ip_set_hash_gen.h
index d32fd6b..5a06ff2 100644
--- a/net/netfilter/ipset/ip_set_hash_gen.h
+++ b/net/netfilter/ipset/ip_set_hash_gen.h
@@ -444,11 +444,8 @@ mtype_gc_init(struct ip_set *set, void (*gc)(unsigned long ul_set))
{
struct htype *h = set->data;
- init_timer(&h->gc);
- h->gc.data = (unsigned long)set;
- h->gc.function = gc;
- h->gc.expires = jiffies + IPSET_GC_PERIOD(set->timeout) * HZ;
- add_timer(&h->gc);
+ setup_timer(&h->gc, gc, (unsigned long)set);
+ mod_timer(&h->gc, jiffies + IPSET_GC_PERIOD(set->timeout) * HZ);
pr_debug("gc initialized, run in every %u\n",
IPSET_GC_PERIOD(set->timeout));
}
--
1.9.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 3/3] netfilter: ipset: use setup_timer() and mod_timer().
2016-05-13 20:58 [PATCH 1/3] netfilter: ipset: use setup_timer() and mod_timer() Muhammad Falak R Wani
2016-05-13 20:58 ` [PATCH 2/3] " Muhammad Falak R Wani
@ 2016-05-13 20:58 ` Muhammad Falak R Wani
2016-05-20 20:40 ` [PATCH 1/3] " Jozsef Kadlecsik
2 siblings, 0 replies; 4+ messages in thread
From: Muhammad Falak R Wani @ 2016-05-13 20:58 UTC (permalink / raw)
To: David S. Miller
Cc: Pablo Neira Ayuso, Patrick McHardy, Jozsef Kadlecsik,
Sergey Popovich, Joshua Hunt, Nikolay Borisov, Vishwanath Pai,
netfilter-devel, coreteam, netdev, linux-kernel
Use setup_timer() and instead of init_timer(), being the preferred way
of setting up a timer.
Also, quoting the mod_timer() function comment:
-> mod_timer() is a more efficient way to update the expire field of an
active timer (if the timer is inactive it will be activated).
Use setup_timer() and mod_timer() to setup and arm a timer, making the
code compact and easier to read.
Signed-off-by: Muhammad Falak R Wani <falakreyaz@gmail.com>
---
net/netfilter/ipset/ip_set_list_set.c | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/net/netfilter/ipset/ip_set_list_set.c b/net/netfilter/ipset/ip_set_list_set.c
index a2a89e4..530da56 100644
--- a/net/netfilter/ipset/ip_set_list_set.c
+++ b/net/netfilter/ipset/ip_set_list_set.c
@@ -570,11 +570,8 @@ list_set_gc_init(struct ip_set *set, void (*gc)(unsigned long ul_set))
{
struct list_set *map = set->data;
- init_timer(&map->gc);
- map->gc.data = (unsigned long)set;
- map->gc.function = gc;
- map->gc.expires = jiffies + IPSET_GC_PERIOD(set->timeout) * HZ;
- add_timer(&map->gc);
+ setup_timer(&map->gc, gc, (unsigned long)set);
+ mod_timer(&map->gc, jiffies + IPSET_GC_PERIOD(set->timeout) * HZ);
}
/* Create list:set type of sets */
--
1.9.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH 1/3] netfilter: ipset: use setup_timer() and mod_timer().
2016-05-13 20:58 [PATCH 1/3] netfilter: ipset: use setup_timer() and mod_timer() Muhammad Falak R Wani
2016-05-13 20:58 ` [PATCH 2/3] " Muhammad Falak R Wani
2016-05-13 20:58 ` [PATCH 3/3] " Muhammad Falak R Wani
@ 2016-05-20 20:40 ` Jozsef Kadlecsik
2 siblings, 0 replies; 4+ messages in thread
From: Jozsef Kadlecsik @ 2016-05-20 20:40 UTC (permalink / raw)
To: Muhammad Falak R Wani
Cc: David S. Miller, Pablo Neira Ayuso, Patrick McHardy,
Vishwanath Pai, Joshua Hunt, netfilter-devel, coreteam, netdev,
linux-kernel
On Sat, 14 May 2016, Muhammad Falak R Wani wrote:
> Use setup_timer() and instead of init_timer(), being the preferred way
> of setting up a timer.
>
> Also, quoting the mod_timer() function comment:
> -> mod_timer() is a more efficient way to update the expire field of an
> active timer (if the timer is inactive it will be activated).
>
> Use setup_timer() and mod_timer() to setup and arm a timer, making the
> code compact and easier to read.
>
> Signed-off-by: Muhammad Falak R Wani <falakreyaz@gmail.com>
> ---
> net/netfilter/ipset/ip_set_bitmap_gen.h | 7 ++-----
> 1 file changed, 2 insertions(+), 5 deletions(-)
The patch and the other too in the series as well are applied in the ipset
git repository and will be submitted for kernel inclusion. Thanks.
Best regards,
Jozsef
-
E-mail : kadlec@blackhole.kfki.hu, kadlecsik.jozsef@wigner.mta.hu
PGP key : http://www.kfki.hu/~kadlec/pgp_public_key.txt
Address : Wigner Research Centre for Physics, Hungarian Academy of Sciences
H-1525 Budapest 114, POB. 49, Hungary
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2016-05-20 20:46 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-05-13 20:58 [PATCH 1/3] netfilter: ipset: use setup_timer() and mod_timer() Muhammad Falak R Wani
2016-05-13 20:58 ` [PATCH 2/3] " Muhammad Falak R Wani
2016-05-13 20:58 ` [PATCH 3/3] " Muhammad Falak R Wani
2016-05-20 20:40 ` [PATCH 1/3] " Jozsef Kadlecsik
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).