The following commit has been merged in the master branch: commit be4f3dbf84c25597ac6073149b3277ac6a46b58c Author: Sven Eckelmann sven.eckelmann@gmx.de Date: Sat Sep 18 15:35:35 2010 +0000

batman-adv: Remove unneeded rcu_read_lock

Regions which do not use rcu functions don't need to protected by rcu_read_lock. If we want to protect data from being freed than it must be covered by the same read-side critical section or otherwise the grace period may already ended and freed the memory before we called rcu_read_lock again.

Signed-off-by: Sven Eckelmann sven.eckelmann@gmx.de

diff --git a/gateway_client.c b/gateway_client.c index dd96d99..bfac0ff 100644 --- a/gateway_client.c +++ b/gateway_client.c @@ -342,9 +342,7 @@ int gw_client_seq_print_text(struct seq_file *seq, void *offset) struct hlist_node *node; int gw_count = 0;

- rcu_read_lock(); if (!bat_priv->primary_if) { - rcu_read_unlock();

return seq_printf(seq, "BATMAN mesh %s disabled - please " "specify interfaces to enable it\n", @@ -352,7 +350,6 @@ int gw_client_seq_print_text(struct seq_file *seq, void *offset) }

if (bat_priv->primary_if->if_status != IF_ACTIVE) { - rcu_read_unlock();

return seq_printf(seq, "BATMAN mesh %s disabled - " "primary interface not active\n", @@ -365,7 +362,6 @@ int gw_client_seq_print_text(struct seq_file *seq, void *offset) "outgoingIF", SOURCE_VERSION, REVISION_VERSION_STR, bat_priv->primary_if->net_dev->name, bat_priv->primary_if->addr_str, net_dev->name); - rcu_read_unlock();

rcu_read_lock(); hlist_for_each_entry_rcu(gw_node, node, &bat_priv->gw_list, list) { diff --git a/originator.c b/originator.c index 2250266..3424ac2 100644 --- a/originator.c +++ b/originator.c @@ -335,7 +335,6 @@ int orig_seq_print_text(struct seq_file *seq, void *offset) net_dev->name); }

- rcu_read_lock(); seq_printf(seq, "[B.A.T.M.A.N. adv %s%s, MainIF/MAC: %s/%s (%s)]\n", SOURCE_VERSION, REVISION_VERSION_STR, bat_priv->primary_if->net_dev->name, @@ -343,7 +342,6 @@ int orig_seq_print_text(struct seq_file *seq, void *offset) seq_printf(seq, " %-15s %s (%s/%i) %17s [%10s]: %20s ...\n", "Originator", "last-seen", "#", TQ_MAX_VALUE, "Nexthop", "outgoingIF", "Potential nexthops"); - rcu_read_unlock();

spin_lock_irqsave(&bat_priv->orig_hash_lock, flags);