From f0c11cb378284623ae54928ea35e1316542a3a18 Mon Sep 17 00:00:00 2001 From: Wei Yongjun Date: Sun, 26 Aug 2012 18:20:45 +0000 Subject: [PATCH] --- yaml --- r: 327740 b: refs/heads/master c: 80f0fd8a7f18af78dd26bf94230e89c3ae82d4ba h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/openvswitch/flow.c | 10 +--------- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/[refs] b/[refs] index 7975091bb1e3..0cf0a9203698 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fc61b928dc4d72176cf4bd4d30bf1d22e599aefc +refs/heads/master: 80f0fd8a7f18af78dd26bf94230e89c3ae82d4ba diff --git a/trunk/net/openvswitch/flow.c b/trunk/net/openvswitch/flow.c index b7f38b161909..c7bf2f26525a 100644 --- a/trunk/net/openvswitch/flow.c +++ b/trunk/net/openvswitch/flow.c @@ -427,19 +427,11 @@ void ovs_flow_deferred_free(struct sw_flow *flow) call_rcu(&flow->rcu, rcu_free_flow_callback); } -/* RCU callback used by ovs_flow_deferred_free_acts. */ -static void rcu_free_acts_callback(struct rcu_head *rcu) -{ - struct sw_flow_actions *sf_acts = container_of(rcu, - struct sw_flow_actions, rcu); - kfree(sf_acts); -} - /* Schedules 'sf_acts' to be freed after the next RCU grace period. * The caller must hold rcu_read_lock for this to be sensible. */ void ovs_flow_deferred_free_acts(struct sw_flow_actions *sf_acts) { - call_rcu(&sf_acts->rcu, rcu_free_acts_callback); + kfree_rcu(sf_acts, rcu); } static int parse_vlan(struct sk_buff *skb, struct sw_flow_key *key)