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 11/20] batman-adv: Rename batadv_gw_node *_free_ref function to *_put
Date: Tue, 23 Feb 2016 14:08:14 +0800 [thread overview]
Message-ID: <1456207703-903-12-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/gateway_client.c | 35 +++++++++++++++++------------------
1 file changed, 17 insertions(+), 18 deletions(-)
diff --git a/net/batman-adv/gateway_client.c b/net/batman-adv/gateway_client.c
index 37972dfda400..c59aff5ccac8 100644
--- a/net/batman-adv/gateway_client.c
+++ b/net/batman-adv/gateway_client.c
@@ -76,11 +76,10 @@ static void batadv_gw_node_release(struct kref *ref)
}
/**
- * batadv_gw_node_free_ref - decrement the gw_node refcounter and possibly
- * release it
+ * batadv_gw_node_put - decrement the gw_node refcounter and possibly release it
* @gw_node: gateway node to free
*/
-static void batadv_gw_node_free_ref(struct batadv_gw_node *gw_node)
+static void batadv_gw_node_put(struct batadv_gw_node *gw_node)
{
kref_put(&gw_node->refcount, batadv_gw_node_release);
}
@@ -125,7 +124,7 @@ unlock:
rcu_read_unlock();
out:
if (gw_node)
- batadv_gw_node_free_ref(gw_node);
+ batadv_gw_node_put(gw_node);
return orig_node;
}
@@ -143,7 +142,7 @@ static void batadv_gw_select(struct batadv_priv *bat_priv,
rcu_assign_pointer(bat_priv->gw.curr_gw, new_gw_node);
if (curr_gw_node)
- batadv_gw_node_free_ref(curr_gw_node);
+ batadv_gw_node_put(curr_gw_node);
spin_unlock_bh(&bat_priv->gw.list_lock);
}
@@ -204,7 +203,7 @@ batadv_gw_get_best_gw_node(struct batadv_priv *bat_priv)
((tmp_gw_factor == max_gw_factor) &&
(tq_avg > max_tq))) {
if (curr_gw)
- batadv_gw_node_free_ref(curr_gw);
+ batadv_gw_node_put(curr_gw);
curr_gw = gw_node;
kref_get(&curr_gw->refcount);
}
@@ -219,7 +218,7 @@ batadv_gw_get_best_gw_node(struct batadv_priv *bat_priv)
*/
if (tq_avg > max_tq) {
if (curr_gw)
- batadv_gw_node_free_ref(curr_gw);
+ batadv_gw_node_put(curr_gw);
curr_gw = gw_node;
kref_get(&curr_gw->refcount);
}
@@ -232,7 +231,7 @@ batadv_gw_get_best_gw_node(struct batadv_priv *bat_priv)
if (tmp_gw_factor > max_gw_factor)
max_gw_factor = tmp_gw_factor;
- batadv_gw_node_free_ref(gw_node);
+ batadv_gw_node_put(gw_node);
next:
batadv_neigh_node_put(router);
@@ -273,7 +272,7 @@ void batadv_gw_check_client_stop(struct batadv_priv *bat_priv)
*/
batadv_throw_uevent(bat_priv, BATADV_UEV_GW, BATADV_UEV_DEL, NULL);
- batadv_gw_node_free_ref(curr_gw);
+ batadv_gw_node_put(curr_gw);
}
void batadv_gw_election(struct batadv_priv *bat_priv)
@@ -348,9 +347,9 @@ void batadv_gw_election(struct batadv_priv *bat_priv)
out:
if (curr_gw)
- batadv_gw_node_free_ref(curr_gw);
+ batadv_gw_node_put(curr_gw);
if (next_gw)
- batadv_gw_node_free_ref(next_gw);
+ batadv_gw_node_put(next_gw);
if (router)
batadv_neigh_node_put(router);
if (router_ifinfo)
@@ -547,7 +546,7 @@ void batadv_gw_node_update(struct batadv_priv *bat_priv,
spin_lock_bh(&bat_priv->gw.list_lock);
if (!hlist_unhashed(&gw_node->list)) {
hlist_del_init_rcu(&gw_node->list);
- batadv_gw_node_free_ref(gw_node);
+ batadv_gw_node_put(gw_node);
}
spin_unlock_bh(&bat_priv->gw.list_lock);
@@ -556,12 +555,12 @@ void batadv_gw_node_update(struct batadv_priv *bat_priv,
batadv_gw_reselect(bat_priv);
if (curr_gw)
- batadv_gw_node_free_ref(curr_gw);
+ batadv_gw_node_put(curr_gw);
}
out:
if (gw_node)
- batadv_gw_node_free_ref(gw_node);
+ batadv_gw_node_put(gw_node);
}
void batadv_gw_node_delete(struct batadv_priv *bat_priv,
@@ -584,7 +583,7 @@ void batadv_gw_node_free(struct batadv_priv *bat_priv)
hlist_for_each_entry_safe(gw_node, node_tmp,
&bat_priv->gw.list, list) {
hlist_del_init_rcu(&gw_node->list);
- batadv_gw_node_free_ref(gw_node);
+ batadv_gw_node_put(gw_node);
}
spin_unlock_bh(&bat_priv->gw.list_lock);
}
@@ -621,7 +620,7 @@ static int batadv_write_buffer_text(struct batadv_priv *bat_priv,
ret = seq_has_overflowed(seq) ? -1 : 0;
if (curr_gw)
- batadv_gw_node_free_ref(curr_gw);
+ batadv_gw_node_put(curr_gw);
out:
if (router_ifinfo)
batadv_neigh_ifinfo_put(router_ifinfo);
@@ -881,9 +880,9 @@ out:
if (orig_dst_node)
batadv_orig_node_put(orig_dst_node);
if (curr_gw)
- batadv_gw_node_free_ref(curr_gw);
+ batadv_gw_node_put(curr_gw);
if (gw_node)
- batadv_gw_node_free_ref(gw_node);
+ batadv_gw_node_put(gw_node);
if (neigh_old)
batadv_neigh_node_put(neigh_old);
if (neigh_curr)
--
2.7.1
next prev parent reply other threads:[~2016-02-23 6:22 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 ` Antonio Quartulli [this message]
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 ` [PATCH 17/20] batman-adv: Rename batadv_orig_node_vlan " Antonio Quartulli
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-12-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).