inet: frags: Convert timers to use timer_setup()
Subsystems (5)
A message that is not in the archive (sent off-list or not yet received): [email protected]
PATCH v2 4/30 inet: frags: Convert timers to use timer_setup()
From: Kees Cook <[email protected]>
In preparation for unconditionally passing the struct timer_list pointer to all timer callbacks, switch to using the new timer_setup() and from_timer() to pass the timer pointer explicitly.
Cc Alexander Aring <[email protected]>
Cc Stefan Schmidt <[email protected]>
Cc "David S. Miller" <[email protected]>
Cc Alexey Kuznetsov <[email protected]>
Cc Hideaki YOSHIFUJI <[email protected]>
Cc Pablo Neira Ayuso <[email protected]>
Cc Jozsef Kadlecsik <[email protected]>
Cc Florian Westphal <[email protected]>
Signed-off-by Kees Cook <[email protected]>
Signed-off-by David S. Miller <[email protected]>
(cherry picked from commit 78802011fbe34331bdef6f2dfb1634011f0e4c32)
--- include/net/inet_frag.h | 2 +- net/ieee802154/6lowpan/reassembly.c | 5 +++-- net/ipv4/inet_fragment.c | 4 ++-- net/ipv4/ip_fragment.c | 5 +++-- net/ipv6/netfilter/nf_conntrack_reasm.c | 5 +++-- net/ipv6/reassembly.c | 5 +++-- 6 files changed, 15 insertions(+), 11 deletions(-)
include/net/inet_frag.h +1 -1
@@ -97,7 +97,7 @@ struct inet_frags {void (*constructor)(struct inet_frag_queue *q,const void *arg);void (*destructor)(struct inet_frag_queue *); -void (*frag_expire)(unsigned long data); +void (*frag_expire)(struct timer_list *t);struct kmem_cache *frags_cachep;const char *frags_cache_name; };
net/ieee802154/6lowpan/reassembly.c +3 -2
@@ -80,12 +80,13 @@ static void lowpan_frag_init(struct inet_frag_queue *q, const void *a) fq->daddr = *arg->dst; } -static void lowpan_frag_expire (unsigned long data) +static void lowpan_frag_expire (struct timer_list *t) { +struct inet_frag_queue *frag =from_timer (frag, t, timer);struct frag_queue *fq;struct net *net; - fq = container_of((struct inet_frag_queue *)data, struct frag_queue, q); + fq = container_of(frag, struct frag_queue, q); net = container_of(fq->q.net, struct net, ieee802154_lowpan.frags);spin_lock (&fq->q.lock);
net/ipv4/inet_fragment.c +2 -2
@@ -150,7 +150,7 @@ inet_evict_bucket(struct inet_frags *f, struct inet_frag_bucket *hb)spin_unlock (&hb->chain_lock);hlist_for_each_entry_safe (fq, n, &expired, list_evictor) - f->frag_expire ((unsigned long ) fq); + f->frag_expire (&fq->timer);return evicted; }
@@ -367,7 +367,7 @@ static struct inet_frag_queue *inet_frag_alloc(struct netns_frags *nf, f->constructor (q, arg);add_frag_mem_limit (nf, f->qsize); -setup_timer (&q->timer, f->frag_expire, (unsigned long )q); +timer_setup (&q->timer, f->frag_expire,0 );spin_lock_init (&q->lock);refcount_set (&q->refcnt,1 );
net/ipv4/ip_fragment.c +3 -2
@@ -191,12 +191,13 @@ static bool frag_expire_skip_icmp(u32 user)/* * Oops, a fragment queue timed out. Kill it and send an ICMP reply. */ -static void ip_expire (unsigned long arg) +static void ip_expire (struct timer_list *t) { +struct inet_frag_queue *frag =from_timer (frag, t, timer);struct ipq *qp;struct net *net; - qp = container_of((struct inet_frag_queue *) arg, struct ipq, q); + qp = container_of(frag, struct ipq, q); net = container_of(qp->q.net, struct net, ipv4.frags);rcu_read_lock ();
net/ipv6/netfilter/nf_conntrack_reasm.c +3 -2
@@ -169,12 +169,13 @@ static unsigned int nf_hashfn(const struct inet_frag_queue *q)return nf_hash_frag (nq->id, &nq->saddr, &nq->daddr); } -static void nf_ct_frag6_expire (unsigned long data) +static void nf_ct_frag6_expire (struct timer_list *t) { +struct inet_frag_queue *frag =from_timer (frag, t, timer);struct frag_queue *fq;struct net *net; - fq = container_of((struct inet_frag_queue *)data, struct frag_queue, q); + fq = container_of(frag, struct frag_queue, q); net = container_of(fq->q.net, struct net, nf_frag.frags);ip6_expire_frag_queue (net, fq);
net/ipv6/reassembly.c +3 -2
@@ -169,12 +169,13 @@ void ip6_expire_frag_queue(struct net *net, struct frag_queue *fq) }EXPORT_SYMBOL (ip6_expire_frag_queue); -static void ip6_frag_expire (unsigned long data) +static void ip6_frag_expire (struct timer_list *t) { +struct inet_frag_queue *frag =from_timer (frag, t, timer);struct frag_queue *fq;struct net *net; - fq = container_of((struct inet_frag_queue *)data, struct frag_queue, q); + fq = container_of(frag, struct frag_queue, q); net = container_of(fq->q.net, struct net, ipv6.frags);ip6_expire_frag_queue (net, fq);
Signature · 1 line
2.18.0