diff options
| author |   Lai Jiangshan <laijs@cn.fujitsu.com> | 2011-03-18 12:07:09 +0800 |
|---|---|---|
| committer |   Paul E. McKenney <paulmck@linux.vnet.ibm.com> | 2011-05-07 22:51:07 -0700 |
| commit | 1f8d36a1869f5efae4fadf6baf01f02211040b97 (patch) | |
| tree | d0dcdedda946cec1c4366875ec275ca17868dbc0 /net/netfilter/nf_conntrack_extend.c | |
| parent | net,rcu: convert call_rcu(net_generic_release) to kfree_rcu() (diff) | |
| download | linux-dev-1f8d36a1869f5efae4fadf6baf01f02211040b97.tar.xz linux-dev-1f8d36a1869f5efae4fadf6baf01f02211040b97.zip | |
net,rcu: convert call_rcu(__nf_ct_ext_free_rcu) to kfree_rcu()
The rcu callback __nf_ct_ext_free_rcu() just calls a kfree(),
so we use kfree_rcu() instead of the call_rcu(__nf_ct_ext_free_rcu).
Signed-off-by: Lai Jiangshan <laijs@cn.fujitsu.com>
Acked-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Reviewed-by: Josh Triplett <josh@joshtriplett.org>
Diffstat (limited to 'net/netfilter/nf_conntrack_extend.c')
| -rw-r--r-- | net/netfilter/nf_conntrack_extend.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/net/netfilter/nf_conntrack_extend.c b/net/netfilter/nf_conntrack_extend.c index 80a23ed62bb0..05ecdc281a53 100644 --- a/net/netfilter/nf_conntrack_extend.c +++ b/net/netfilter/nf_conntrack_extend.c @@ -68,12 +68,6 @@ nf_ct_ext_create(struct nf_ct_ext **ext, enum nf_ct_ext_id id, gfp_t gfp) return (void *)(*ext) + off; } -static void __nf_ct_ext_free_rcu(struct rcu_head *head) -{ - struct nf_ct_ext *ext = container_of(head, struct nf_ct_ext, rcu); - kfree(ext); -} - void *__nf_ct_ext_add(struct nf_conn *ct, enum nf_ct_ext_id id, gfp_t gfp) { struct nf_ct_ext *old, *new; @@ -114,7 +108,7 @@ void *__nf_ct_ext_add(struct nf_conn *ct, enum nf_ct_ext_id id, gfp_t gfp) (void *)old + old->offset[i]); rcu_read_unlock(); } - call_rcu(&old->rcu, __nf_ct_ext_free_rcu); + kfree_rcu(old, rcu); ct->ext = new; } |