netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
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 09/20] batman-adv: Rename batadv_claim *_free_ref function to *_put
Date: Tue, 23 Feb 2016 14:08:12 +0800	[thread overview]
Message-ID: <1456207703-903-10-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/bridge_loop_avoidance.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/net/batman-adv/bridge_loop_avoidance.c b/net/batman-adv/bridge_loop_avoidance.c
index ce2d0701fb59..0a6c8b824a00 100644
--- a/net/batman-adv/bridge_loop_avoidance.c
+++ b/net/batman-adv/bridge_loop_avoidance.c
@@ -184,11 +184,11 @@ static void batadv_claim_release(struct kref *ref)
 }
 
 /**
- * batadv_claim_free_ref - decrement the claim refcounter and possibly
+ * batadv_claim_put - decrement the claim refcounter and possibly
  *  release it
  * @claim: claim to be free'd
  */
-static void batadv_claim_free_ref(struct batadv_bla_claim *claim)
+static void batadv_claim_put(struct batadv_bla_claim *claim)
 {
 	kref_put(&claim->refcount, batadv_claim_release);
 }
@@ -304,7 +304,7 @@ batadv_bla_del_backbone_claims(struct batadv_bla_backbone_gw *backbone_gw)
 			if (claim->backbone_gw != backbone_gw)
 				continue;
 
-			batadv_claim_free_ref(claim);
+			batadv_claim_put(claim);
 			hlist_del_rcu(&claim->hash_entry);
 		}
 		spin_unlock_bh(list_lock);
@@ -693,7 +693,7 @@ static void batadv_bla_add_claim(struct batadv_priv *bat_priv,
 	backbone_gw->lasttime = jiffies;
 
 claim_free_ref:
-	batadv_claim_free_ref(claim);
+	batadv_claim_put(claim);
 }
 
 /**
@@ -718,14 +718,14 @@ static void batadv_bla_del_claim(struct batadv_priv *bat_priv,
 
 	batadv_hash_remove(bat_priv->bla.claim_hash, batadv_compare_claim,
 			   batadv_choose_claim, claim);
-	batadv_claim_free_ref(claim); /* reference from the hash is gone */
+	batadv_claim_put(claim); /* reference from the hash is gone */
 
 	spin_lock_bh(&claim->backbone_gw->crc_lock);
 	claim->backbone_gw->crc ^= crc16(0, claim->addr, ETH_ALEN);
 	spin_unlock_bh(&claim->backbone_gw->crc_lock);
 
 	/* don't need the reference from hash_find() anymore */
-	batadv_claim_free_ref(claim);
+	batadv_claim_put(claim);
 }
 
 /**
@@ -1693,7 +1693,7 @@ out:
 	if (primary_if)
 		batadv_hardif_put(primary_if);
 	if (claim)
-		batadv_claim_free_ref(claim);
+		batadv_claim_put(claim);
 	return ret;
 }
 
@@ -1782,7 +1782,7 @@ out:
 	if (primary_if)
 		batadv_hardif_put(primary_if);
 	if (claim)
-		batadv_claim_free_ref(claim);
+		batadv_claim_put(claim);
 	return ret;
 }
 
-- 
2.7.1

  parent reply	other threads:[~2016-02-23  6:11 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 ` Antonio Quartulli [this message]
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 ` [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-10-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).