aboutsummaryrefslogtreecommitdiffstats
path: root/net/netfilter
diff options
context:
space:
mode:
authorPaul E. McKenney <paulmck@linux.vnet.ibm.com>2011-05-02 04:00:18 -0400
committerPaul E. McKenney <paulmck@linux.vnet.ibm.com>2011-07-20 17:10:19 -0400
commitcefcb602012482003ca2ccc44fcba628d006e4bd (patch)
tree798dc373f83d8b7e6c5de17a13288e589218be48 /net/netfilter
parenta95cded32de3deae13af34715200532e6823cc9f (diff)
net,rcu: Convert call_rcu(xt_rateest_free_rcu) to kfree_rcu()
The RCU callback xt_rateest_free_rcu() just calls kfree(), so we can use kfree_rcu() instead of call_rcu(). This also allows us to dispense with an rcu_barrier() call, speeding up unloading of this module. Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com> Cc: Patrick McHardy <kaber@trash.net> Reviewed-by: Josh Triplett <josh@joshtriplett.org>
Diffstat (limited to 'net/netfilter')
-rw-r--r--net/netfilter/xt_RATEEST.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/net/netfilter/xt_RATEEST.c b/net/netfilter/xt_RATEEST.c
index de079abd5bc8..f264032b8c56 100644
--- a/net/netfilter/xt_RATEEST.c
+++ b/net/netfilter/xt_RATEEST.c
@@ -60,11 +60,6 @@ struct xt_rateest *xt_rateest_lookup(const char *name)
60} 60}
61EXPORT_SYMBOL_GPL(xt_rateest_lookup); 61EXPORT_SYMBOL_GPL(xt_rateest_lookup);
62 62
63static void xt_rateest_free_rcu(struct rcu_head *head)
64{
65 kfree(container_of(head, struct xt_rateest, rcu));
66}
67
68void xt_rateest_put(struct xt_rateest *est) 63void xt_rateest_put(struct xt_rateest *est)
69{ 64{
70 mutex_lock(&xt_rateest_mutex); 65 mutex_lock(&xt_rateest_mutex);
@@ -75,7 +70,7 @@ void xt_rateest_put(struct xt_rateest *est)
75 * gen_estimator est_timer() might access est->lock or bstats, 70 * gen_estimator est_timer() might access est->lock or bstats,
76 * wait a RCU grace period before freeing 'est' 71 * wait a RCU grace period before freeing 'est'
77 */ 72 */
78 call_rcu(&est->rcu, xt_rateest_free_rcu); 73 kfree_rcu(est, rcu);
79 } 74 }
80 mutex_unlock(&xt_rateest_mutex); 75 mutex_unlock(&xt_rateest_mutex);
81} 76}
@@ -188,7 +183,6 @@ static int __init xt_rateest_tg_init(void)
188static void __exit xt_rateest_tg_fini(void) 183static void __exit xt_rateest_tg_fini(void)
189{ 184{
190 xt_unregister_target(&xt_rateest_tg_reg); 185 xt_unregister_target(&xt_rateest_tg_reg);
191 rcu_barrier(); /* Wait for completion of call_rcu()'s (xt_rateest_free_rcu) */
192} 186}
193 187
194 188