OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

batman-adv: Rename batadv_orig_node_vlan *_free_ref function to *_put 

The batman-adv source code is the only place in the kernel which uses the
*_free_ref naming scheme for the *_put functions. Changing it to *_put
makes it more consistent and makes it easier to understand the connection
to the *_get functions.

Signed-off-by: Sven Eckelmann <sven@narfation.org>
Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
Signed-off-by: Antonio Quartulli <a@unstable.cc>
This commit is contained in:
Sven Eckelmann 2016-01-17 11:01:24 +01:00 committed by Antonio Quartulli
parent 5fff28255f
commit 21754e2501
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
net/batman-adv/originator.c
View File

@ -151,11 +151,11 @@ static void batadv_orig_node_vlan_release(struct kref *ref)
} }
/** /**
* batadv_orig_node_vlan_free_ref - decrement the refcounter and possibly * batadv_orig_node_vlan_put - decrement the refcounter and possibly release
* release the originator-vlan object * the originator-vlan object
* @orig_vlan: the originator-vlan object to release * @orig_vlan: the originator-vlan object to release
*/ */
void batadv_orig_node_vlan_free_ref(struct batadv_orig_node_vlan *orig_vlan) void batadv_orig_node_vlan_put(struct batadv_orig_node_vlan *orig_vlan)
{ {
kref_put(&orig_vlan->refcount, batadv_orig_node_vlan_release); kref_put(&orig_vlan->refcount, batadv_orig_node_vlan_release);
} }
@ -917,7 +917,7 @@ struct batadv_orig_node *batadv_orig_node_new(struct batadv_priv *bat_priv,
* Immediately release vlan since it is not needed anymore in this * Immediately release vlan since it is not needed anymore in this
* context * context
*/ */
batadv_orig_node_vlan_free_ref(vlan); batadv_orig_node_vlan_put(vlan);
for (i = 0; i < BATADV_FRAG_BUFFER_COUNT; i++) { for (i = 0; i < BATADV_FRAG_BUFFER_COUNT; i++) {
INIT_HLIST_HEAD(&orig_node->fragments[i].head); INIT_HLIST_HEAD(&orig_node->fragments[i].head);

2
net/batman-adv/originator.h
View File

@ -83,7 +83,7 @@ batadv_orig_node_vlan_new(struct batadv_orig_node *orig_node,
struct batadv_orig_node_vlan * struct batadv_orig_node_vlan *
batadv_orig_node_vlan_get(struct batadv_orig_node *orig_node, batadv_orig_node_vlan_get(struct batadv_orig_node *orig_node,
unsigned short vid); unsigned short vid);
void batadv_orig_node_vlan_free_ref(struct batadv_orig_node_vlan *orig_vlan); void batadv_orig_node_vlan_put(struct batadv_orig_node_vlan *orig_vlan);
/* hashfunction to choose an entry in a hash table of given size /* hashfunction to choose an entry in a hash table of given size
* hash algorithm from http://en.wikipedia.org/wiki/Hash_table * hash algorithm from http://en.wikipedia.org/wiki/Hash_table

10
net/batman-adv/translation-table.c
View File

@ -348,12 +348,12 @@ static void batadv_tt_global_size_mod(struct batadv_orig_node *orig_node,
spin_lock_bh(&orig_node->vlan_list_lock); spin_lock_bh(&orig_node->vlan_list_lock);
if (!hlist_unhashed(&vlan->list)) { if (!hlist_unhashed(&vlan->list)) {
hlist_del_init_rcu(&vlan->list); hlist_del_init_rcu(&vlan->list);
batadv_orig_node_vlan_free_ref(vlan); batadv_orig_node_vlan_put(vlan);
} }
spin_unlock_bh(&orig_node->vlan_list_lock); spin_unlock_bh(&orig_node->vlan_list_lock);
} }
batadv_orig_node_vlan_free_ref(vlan); batadv_orig_node_vlan_put(vlan);
} }
/** /**
@ -1652,7 +1652,7 @@ batadv_tt_global_print_entry(struct batadv_priv *bat_priv,
((flags & BATADV_TT_CLIENT_ISOLA) ? 'I' : '.'), ((flags & BATADV_TT_CLIENT_ISOLA) ? 'I' : '.'),
((flags & BATADV_TT_CLIENT_TEMP) ? 'T' : '.')); ((flags & BATADV_TT_CLIENT_TEMP) ? 'T' : '.'));
batadv_orig_node_vlan_free_ref(vlan); batadv_orig_node_vlan_put(vlan);
} }
print_list: print_list:
@ -1684,7 +1684,7 @@ print_list:
((flags & BATADV_TT_CLIENT_ISOLA) ? 'I' : '.'), ((flags & BATADV_TT_CLIENT_ISOLA) ? 'I' : '.'),
((flags & BATADV_TT_CLIENT_TEMP) ? 'T' : '.')); ((flags & BATADV_TT_CLIENT_TEMP) ? 'T' : '.'));
batadv_orig_node_vlan_free_ref(vlan); batadv_orig_node_vlan_put(vlan);
} }
} }
@ -2503,7 +2503,7 @@ static bool batadv_tt_global_check_crc(struct batadv_orig_node *orig_node,
return false; return false;
crc = vlan->tt.crc; crc = vlan->tt.crc;
batadv_orig_node_vlan_free_ref(vlan); batadv_orig_node_vlan_put(vlan);
if (crc != ntohl(tt_vlan_tmp->crc)) if (crc != ntohl(tt_vlan_tmp->crc))
return false; return false;