Linux Container Development
 help / color / mirror / Atom feed
From: Lai Jiangshan <laijs-BthXqXjhjHXQFUHtdCDX3A@public.gmane.org>
To: Ingo Molnar <mingo-X9Un+BFzKDI@public.gmane.org>,
	"Paul E. McKenney"
	<paulmck-23VcF4HTsmIX0ybBhKVfKdBPR1lH4CV8@public.gmane.org>,
	Jens Axboe <axboe-tSWWG44O7X1aa/9Udqfwiw@public.gmane.org>,
	Trond Myklebust
	<Trond.Myklebust-HgOvQuBEEgTQT0dZR+AlfA@public.gmane.org>
Subject: [PATCH 09/17] net,rcu: convert call_rcu(kfree_tid_tx) to kfree_rcu()
Date: Tue, 15 Mar 2011 18:02:42 +0800	[thread overview]
Message-ID: <4D7F3942.3080703@cn.fujitsu.com> (raw)
In-Reply-To: <4D7F3610.6000809-BthXqXjhjHXQFUHtdCDX3A@public.gmane.org>



The rcu callback kfree_tid_tx() just calls a kfree(),
so we use kfree_rcu() instead of the call_rcu(kfree_tid_tx).

Signed-off-by: Lai Jiangshan <laijs-BthXqXjhjHXQFUHtdCDX3A@public.gmane.org>
---
 net/mac80211/agg-tx.c |   14 +++-----------
 1 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/net/mac80211/agg-tx.c b/net/mac80211/agg-tx.c
index 9cc472c..7f25f20 100644
--- a/net/mac80211/agg-tx.c
+++ b/net/mac80211/agg-tx.c
@@ -136,14 +136,6 @@ void ieee80211_send_bar(struct ieee80211_sub_if_data *sdata, u8 *ra, u16 tid, u1
 	ieee80211_tx_skb(sdata, skb);
 }
 
-static void kfree_tid_tx(struct rcu_head *rcu_head)
-{
-	struct tid_ampdu_tx *tid_tx =
-	    container_of(rcu_head, struct tid_ampdu_tx, rcu_head);
-
-	kfree(tid_tx);
-}
-
 int ___ieee80211_stop_tx_ba_session(struct sta_info *sta, u16 tid,
 				    enum ieee80211_back_parties initiator,
 				    bool tx)
@@ -163,7 +155,7 @@ int ___ieee80211_stop_tx_ba_session(struct sta_info *sta, u16 tid,
 		/* not even started yet! */
 		rcu_assign_pointer(sta->ampdu_mlme.tid_tx[tid], NULL);
 		spin_unlock_bh(&sta->lock);
-		call_rcu(&tid_tx->rcu_head, kfree_tid_tx);
+		kfree_rcu(tid_tx, rcu_head);
 		return 0;
 	}
 
@@ -322,7 +314,7 @@ void ieee80211_tx_ba_session_handle_start(struct sta_info *sta, int tid)
 		spin_unlock_bh(&sta->lock);
 
 		ieee80211_wake_queue_agg(local, tid);
-		call_rcu(&tid_tx->rcu_head, kfree_tid_tx);
+		kfree_rcu(tid_tx, rcu_head);
 		return;
 	}
 
@@ -699,7 +691,7 @@ void ieee80211_stop_tx_ba_cb(struct ieee80211_vif *vif, u8 *ra, u8 tid)
 
 	ieee80211_agg_splice_finish(local, tid);
 
-	call_rcu(&tid_tx->rcu_head, kfree_tid_tx);
+	kfree_rcu(tid_tx, rcu_head);
 
  unlock_sta:
 	spin_unlock_bh(&sta->lock);
-- 
1.7.4

  parent reply	other threads:[~2011-03-15 10:02 UTC|newest]

Thread overview: 32+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-03-15  9:49 [PATCH 0/17] rcu: covert call_rcu(simple_kfree_callbck) to kfree_rcu() (PART 1) Lai Jiangshan
     [not found] ` <4D7F3610.6000809-BthXqXjhjHXQFUHtdCDX3A@public.gmane.org>
2011-03-15  9:53   ` [PATCH 01/17] cgroup, rcu: convert call_rcu(free_css_set_rcu) to kfree_rcu() Lai Jiangshan
     [not found]     ` <4D7F372A.6050407-BthXqXjhjHXQFUHtdCDX3A@public.gmane.org>
2011-03-15 20:03       ` Paul Menage
2011-03-15  9:55   ` [PATCH 02/17] cgroup, rcu: convert call_rcu(free_cgroup_rcu) " Lai Jiangshan
     [not found]     ` <4D7F3784.6090307-BthXqXjhjHXQFUHtdCDX3A@public.gmane.org>
2011-03-15 20:04       ` Paul Menage
2011-03-15  9:56   ` [PATCH 03/17] cgroup, rcu: convert call_rcu(__free_css_id_cb) " Lai Jiangshan
     [not found]     ` <4D7F37BA.5000308-BthXqXjhjHXQFUHtdCDX3A@public.gmane.org>
2011-03-15 20:04       ` Paul Menage
2011-03-15  9:57   ` [PATCH 04/17] net, rcu: convert call_rcu(tcf_common_free_rcu) " Lai Jiangshan
     [not found]     ` <4D7F37F0.1050801-BthXqXjhjHXQFUHtdCDX3A@public.gmane.org>
2011-03-15 21:02       ` [PATCH 04/17] net,rcu: " David Miller
2011-03-15  9:58   ` [PATCH 05/17] net, rcu: convert call_rcu(tcf_police_free_rcu) " Lai Jiangshan
     [not found]     ` <4D7F3828.4040403-BthXqXjhjHXQFUHtdCDX3A@public.gmane.org>
2011-03-15 21:02       ` [PATCH 05/17] net,rcu: " David Miller
2011-03-15  9:59   ` [PATCH 06/17] net,rcu: convert call_rcu(in6_dev_finish_destroy_rcu) " Lai Jiangshan
     [not found]     ` <4D7F3872.6090305-BthXqXjhjHXQFUHtdCDX3A@public.gmane.org>
2011-03-15 21:03       ` David Miller
2011-03-15 10:00   ` [PATCH 07/17] net, rcu: convert call_rcu(inet6_ifa_finish_destroy_rcu) " Lai Jiangshan
     [not found]     ` <4D7F38AE.7060708-BthXqXjhjHXQFUHtdCDX3A@public.gmane.org>
2011-03-15 21:03       ` [PATCH 07/17] net,rcu: " David Miller
2011-03-15 10:01   ` [PATCH 08/17] net, rcu: convert call_rcu(listeners_free_rcu) " Lai Jiangshan
     [not found]     ` <4D7F3906.3090107-BthXqXjhjHXQFUHtdCDX3A@public.gmane.org>
2011-03-15 21:03       ` [PATCH 08/17] net,rcu: " David Miller
2011-03-15 10:02   ` Lai Jiangshan [this message]
2011-03-15 10:03   ` [PATCH 10/17] audit_tree, rcu: convert call_rcu(__put_tree) " Lai Jiangshan
2011-03-15 10:05   ` [PATCH 11/17] net,rcu: convert call_rcu(sctp_local_addr_free) " Lai Jiangshan
     [not found]     ` <4D7F39CE.80403-BthXqXjhjHXQFUHtdCDX3A@public.gmane.org>
2011-03-15 21:03       ` David Miller
2011-03-15 10:06   ` [PATCH 12/17] block, rcu: convert call_rcu(cfq_cfqd_free) " Lai Jiangshan
2011-03-15 10:07   ` [PATCH 13/17] nfs, rcu: convert call_rcu(nfs_free_delegation_callback) " Lai Jiangshan
2011-03-15 10:07   ` [PATCH 14/17] security,rcu: convert call_rcu(whitelist_item_free) " Lai Jiangshan
2011-03-15 10:08   ` [PATCH 15/17] net,rcu: convert call_rcu(ha_rcu_free) " Lai Jiangshan
     [not found]     ` <4D7F3ABA.7020709-BthXqXjhjHXQFUHtdCDX3A@public.gmane.org>
2011-03-15 21:04       ` David Miller
2011-03-15 10:10   ` [PATCH 16/17] net, rcu: convert call_rcu(dn_dev_free_ifa_rcu) " Lai Jiangshan
     [not found]     ` <4D7F3B04.9080504-BthXqXjhjHXQFUHtdCDX3A@public.gmane.org>
2011-03-15 21:04       ` [PATCH 16/17] net,rcu: " David Miller
2011-03-15 10:11   ` [PATCH 17/17] net,act_police,rcu: remove rcu_barrier() Lai Jiangshan
     [not found]     ` <4D7F3B62.6000005-BthXqXjhjHXQFUHtdCDX3A@public.gmane.org>
2011-03-15 11:04       ` Eric Dumazet
2011-03-16  3:13         ` Lai Jiangshan
2011-03-15 21:04       ` David Miller

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=4D7F3942.3080703@cn.fujitsu.com \
    --to=laijs-bthxqxjhjhxqfuhtdcdx3a@public.gmane.org \
    --cc=Trond.Myklebust-HgOvQuBEEgTQT0dZR+AlfA@public.gmane.org \
    --cc=axboe-tSWWG44O7X1aa/9Udqfwiw@public.gmane.org \
    --cc=mingo-X9Un+BFzKDI@public.gmane.org \
    --cc=paulmck-23VcF4HTsmIX0ybBhKVfKdBPR1lH4CV8@public.gmane.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox