From: Antonio Quartulli <a@unstable.cc>
To: davem@davemloft.net
Cc: netdev@vger.kernel.org, b.a.t.m.a.n@lists.open-mesh.org,
Sven Eckelmann <sven@narfation.org>,
Marek Lindner <mareklindner@neomailbox.ch>,
Antonio Quartulli <a@unstable.cc>
Subject: [PATCH 17/20] batman-adv: Rename batadv_orig_node_vlan *_free_ref function to *_put
Date: Tue, 23 Feb 2016 14:08:20 +0800 [thread overview]
Message-ID: <1456207703-903-18-git-send-email-a@unstable.cc> (raw)
In-Reply-To: <1456207703-903-1-git-send-email-a@unstable.cc>
From: Sven Eckelmann <sven@narfation.org>
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>
---
net/batman-adv/originator.c | 8 ++++----
net/batman-adv/originator.h | 2 +-
net/batman-adv/translation-table.c | 10 +++++-----
3 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/net/batman-adv/originator.c b/net/batman-adv/originator.c
index 0b1a77da2e1e..e4cbb0753e37 100644
--- a/net/batman-adv/originator.c
+++ b/net/batman-adv/originator.c
@@ -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
- * release the originator-vlan object
+ * batadv_orig_node_vlan_put - decrement the refcounter and possibly release
+ * the originator-vlan object
* @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);
}
@@ -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
* context
*/
- batadv_orig_node_vlan_free_ref(vlan);
+ batadv_orig_node_vlan_put(vlan);
for (i = 0; i < BATADV_FRAG_BUFFER_COUNT; i++) {
INIT_HLIST_HEAD(&orig_node->fragments[i].head);
diff --git a/net/batman-adv/originator.h b/net/batman-adv/originator.h
index 97748e84b66b..4e8b67f11051 100644
--- a/net/batman-adv/originator.h
+++ b/net/batman-adv/originator.h
@@ -83,7 +83,7 @@ batadv_orig_node_vlan_new(struct batadv_orig_node *orig_node,
struct batadv_orig_node_vlan *
batadv_orig_node_vlan_get(struct batadv_orig_node *orig_node,
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
* hash algorithm from http://en.wikipedia.org/wiki/Hash_table
diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c
index b81f8ea3395d..396b095c8a1d 100644
--- a/net/batman-adv/translation-table.c
+++ b/net/batman-adv/translation-table.c
@@ -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);
if (!hlist_unhashed(&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);
}
- 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_TEMP) ? 'T' : '.'));
- batadv_orig_node_vlan_free_ref(vlan);
+ batadv_orig_node_vlan_put(vlan);
}
print_list:
@@ -1684,7 +1684,7 @@ print_list:
((flags & BATADV_TT_CLIENT_ISOLA) ? 'I' : '.'),
((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;
crc = vlan->tt.crc;
- batadv_orig_node_vlan_free_ref(vlan);
+ batadv_orig_node_vlan_put(vlan);
if (crc != ntohl(tt_vlan_tmp->crc))
return false;
--
2.7.1
next prev parent reply other threads:[~2016-02-23 6:20 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <1456207703-903-1-git-send-email-a@unstable.cc>
2016-02-23 6:08 ` [PATCH 01/20] batman-adv: remove unused BATADV_BONDING_TQ_THRESHOLD constant Antonio Quartulli
2016-02-23 6:08 ` [PATCH 02/20] batman-adv: Rename batadv_orig_node *_free_ref function to *_put Antonio Quartulli
2016-02-23 6:08 ` [PATCH 03/20] batman-adv: Rename batadv_hardif " Antonio Quartulli
2016-02-23 6:08 ` [PATCH 04/20] batman-adv: Rename batadv_neigh_node " Antonio Quartulli
2016-02-23 6:08 ` [PATCH 05/20] batman-adv: Rename batadv_neigh_ifinfo " Antonio Quartulli
2016-02-23 6:08 ` [PATCH 06/20] batman-adv: Rename batadv_orig_ifinfo " Antonio Quartulli
2016-02-23 6:08 ` [PATCH 07/20] batman-adv: Rename batadv_hardif_neigh " Antonio Quartulli
2016-02-23 6:08 ` [PATCH 08/20] batman-adv: Rename batadv_backbone_gw " Antonio Quartulli
2016-02-23 6:08 ` [PATCH 09/20] batman-adv: Rename batadv_claim " Antonio Quartulli
2016-02-23 6:08 ` [PATCH 10/20] batman-adv: Rename batadv_dat_entry " Antonio Quartulli
2016-02-23 6:08 ` [PATCH 11/20] batman-adv: Rename batadv_gw_node " Antonio Quartulli
2016-02-23 6:08 ` [PATCH 12/20] batman-adv: Rename batadv_tvlv_handler " Antonio Quartulli
2016-02-23 6:08 ` [PATCH 13/20] batman-adv: Rename batadv_tvlv_container " Antonio Quartulli
2016-02-23 6:08 ` [PATCH 14/20] batman-adv: Rename batadv_softif_vlan " Antonio Quartulli
2016-02-23 6:08 ` [PATCH 15/20] batman-adv: Rename batadv_nc_node " Antonio Quartulli
2016-02-23 6:08 ` [PATCH 16/20] batman-adv: Rename batadv_nc_path " Antonio Quartulli
2016-02-23 6:08 ` Antonio Quartulli [this message]
2016-02-23 6:08 ` [PATCH 18/20] batman-adv: Rename batadv_tt_local_entry " Antonio Quartulli
2016-02-23 6:08 ` [PATCH 19/20] batman-adv: Rename batadv_tt_global_entry " Antonio Quartulli
2016-02-23 6:08 ` [PATCH 20/20] batman-adv: Rename batadv_tt_orig_list_entry " Antonio Quartulli
[not found] ` <1456207703-903-1-git-send-email-a-2CpIooy/SPIKlTDg6p0iyA@public.gmane.org>
2016-02-23 19:49 ` pull request [net-next]: batman-adv 20160223 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=1456207703-903-18-git-send-email-a@unstable.cc \
--to=a@unstable.cc \
--cc=b.a.t.m.a.n@lists.open-mesh.org \
--cc=davem@davemloft.net \
--cc=mareklindner@neomailbox.ch \
--cc=netdev@vger.kernel.org \
--cc=sven@narfation.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;
as well as URLs for NNTP newsgroup(s).