[linux-next] LinuxNextTracking branch, master, updated. next-20120627

batman at open-mesh.org batman at open-mesh.org
Thu Jun 28 00:16:36 CEST 2012


The following commit has been merged in the master branch:
commit 29cb99de4dafc53f75389bbe0173af4385a2ed1d
Author: Antonio Quartulli <ordex at autistici.org>
Date:   Mon Jun 25 20:49:51 2012 +0000

    batman-adv: fix global TT entry deletion
    
    During the last merge involving translation-table.c something went wrong and two
    lines disappeared from translation-table.c. This patch recovers them.
    
    Signed-off-by: Antonio Quartulli <ordex at autistici.org>
    Signed-off-by: David S. Miller <davem at davemloft.net>

diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c
index e4f27a8..c673b58 100644
--- a/net/batman-adv/translation-table.c
+++ b/net/batman-adv/translation-table.c
@@ -149,6 +149,8 @@ static void batadv_tt_orig_list_entry_free_rcu(struct rcu_head *rcu)
 static void
 batadv_tt_orig_list_entry_free_ref(struct tt_orig_list_entry *orig_entry)
 {
+	/* to avoid race conditions, immediately decrease the tt counter */
+	atomic_dec(&orig_entry->orig_node->tt_size);
 	call_rcu(&orig_entry->rcu, batadv_tt_orig_list_entry_free_rcu);
 }
 

-- 
LinuxNextTracking


More information about the linux-merge mailing list