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,
Antonio Quartulli <a@unstable.cc>,
Marek Lindner <mareklindner@neomailbox.ch>
Subject: [B.A.T.M.A.N.] [PATCH 12/20] batman-adv: Rename batadv_tvlv_handler *_free_ref function to *_put
Date: Tue, 23 Feb 2016 14:08:15 +0800 [thread overview]
Message-ID: <1456207703-903-13-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/main.c | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/net/batman-adv/main.c b/net/batman-adv/main.c
index 476554b3adce..95aaff371966 100644
--- a/net/batman-adv/main.c
+++ b/net/batman-adv/main.c
@@ -638,12 +638,11 @@ static void batadv_tvlv_handler_release(struct kref *ref)
}
/**
- * batadv_tvlv_handler_free_ref - decrement the tvlv container refcounter and
+ * batadv_tvlv_handler_put - decrement the tvlv container refcounter and
* possibly release it
* @tvlv_handler: the tvlv handler to free
*/
-static void
-batadv_tvlv_handler_free_ref(struct batadv_tvlv_handler *tvlv_handler)
+static void batadv_tvlv_handler_put(struct batadv_tvlv_handler *tvlv_handler)
{
kref_put(&tvlv_handler->refcount, batadv_tvlv_handler_release);
}
@@ -1031,7 +1030,7 @@ int batadv_tvlv_containers_process(struct batadv_priv *bat_priv,
src, dst, tvlv_value,
tvlv_value_cont_len);
if (tvlv_handler)
- batadv_tvlv_handler_free_ref(tvlv_handler);
+ batadv_tvlv_handler_put(tvlv_handler);
tvlv_value = (u8 *)tvlv_value + tvlv_value_cont_len;
tvlv_value_len -= tvlv_value_cont_len;
}
@@ -1111,7 +1110,7 @@ void batadv_tvlv_handler_register(struct batadv_priv *bat_priv,
tvlv_handler = batadv_tvlv_handler_get(bat_priv, type, version);
if (tvlv_handler) {
- batadv_tvlv_handler_free_ref(tvlv_handler);
+ batadv_tvlv_handler_put(tvlv_handler);
return;
}
@@ -1148,11 +1147,11 @@ void batadv_tvlv_handler_unregister(struct batadv_priv *bat_priv,
if (!tvlv_handler)
return;
- batadv_tvlv_handler_free_ref(tvlv_handler);
+ batadv_tvlv_handler_put(tvlv_handler);
spin_lock_bh(&bat_priv->tvlv.handler_list_lock);
hlist_del_rcu(&tvlv_handler->list);
spin_unlock_bh(&bat_priv->tvlv.handler_list_lock);
- batadv_tvlv_handler_free_ref(tvlv_handler);
+ batadv_tvlv_handler_put(tvlv_handler);
}
/**
--
2.7.1
next prev parent reply other threads:[~2016-02-23 6:08 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-23 6:08 [B.A.T.M.A.N.] pull request [net-next]: batman-adv 20160223 Antonio Quartulli
2016-02-23 6:08 ` [B.A.T.M.A.N.] [PATCH 01/20] batman-adv: remove unused BATADV_BONDING_TQ_THRESHOLD constant Antonio Quartulli
2016-02-23 6:08 ` [B.A.T.M.A.N.] [PATCH 02/20] batman-adv: Rename batadv_orig_node *_free_ref function to *_put Antonio Quartulli
2016-02-23 6:08 ` [B.A.T.M.A.N.] [PATCH 03/20] batman-adv: Rename batadv_hardif " Antonio Quartulli
2016-02-23 6:08 ` [B.A.T.M.A.N.] [PATCH 04/20] batman-adv: Rename batadv_neigh_node " Antonio Quartulli
2016-02-23 6:08 ` [B.A.T.M.A.N.] [PATCH 05/20] batman-adv: Rename batadv_neigh_ifinfo " Antonio Quartulli
2016-02-23 6:08 ` [B.A.T.M.A.N.] [PATCH 06/20] batman-adv: Rename batadv_orig_ifinfo " Antonio Quartulli
2016-02-23 6:08 ` [B.A.T.M.A.N.] [PATCH 07/20] batman-adv: Rename batadv_hardif_neigh " Antonio Quartulli
2016-02-23 6:08 ` [B.A.T.M.A.N.] [PATCH 08/20] batman-adv: Rename batadv_backbone_gw " Antonio Quartulli
2016-02-23 6:08 ` [B.A.T.M.A.N.] [PATCH 09/20] batman-adv: Rename batadv_claim " Antonio Quartulli
2016-02-23 6:08 ` [B.A.T.M.A.N.] [PATCH 10/20] batman-adv: Rename batadv_dat_entry " Antonio Quartulli
2016-02-23 6:08 ` [B.A.T.M.A.N.] [PATCH 11/20] batman-adv: Rename batadv_gw_node " Antonio Quartulli
2016-02-23 6:08 ` Antonio Quartulli [this message]
2016-02-23 6:08 ` [B.A.T.M.A.N.] [PATCH 13/20] batman-adv: Rename batadv_tvlv_container " Antonio Quartulli
2016-02-23 6:08 ` [B.A.T.M.A.N.] [PATCH 14/20] batman-adv: Rename batadv_softif_vlan " Antonio Quartulli
2016-02-23 6:08 ` [B.A.T.M.A.N.] [PATCH 15/20] batman-adv: Rename batadv_nc_node " Antonio Quartulli
2016-02-23 6:08 ` [B.A.T.M.A.N.] [PATCH 16/20] batman-adv: Rename batadv_nc_path " Antonio Quartulli
2016-02-23 6:08 ` [B.A.T.M.A.N.] [PATCH 17/20] batman-adv: Rename batadv_orig_node_vlan " Antonio Quartulli
2016-02-23 6:08 ` [B.A.T.M.A.N.] [PATCH 18/20] batman-adv: Rename batadv_tt_local_entry " Antonio Quartulli
2016-02-23 6:08 ` [B.A.T.M.A.N.] [PATCH 19/20] batman-adv: Rename batadv_tt_global_entry " Antonio Quartulli
2016-02-23 6:08 ` [B.A.T.M.A.N.] [PATCH 20/20] batman-adv: Rename batadv_tt_orig_list_entry " Antonio Quartulli
2016-02-23 19:49 ` [B.A.T.M.A.N.] 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-13-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 \
/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).