public inbox for b.a.t.m.a.n@lists.open-mesh.org
 help / color / mirror / Atom feed
From: Sven Eckelmann <sven@narfation.org>
To: b.a.t.m.a.n@lists.open-mesh.org
Subject: [B.A.T.M.A.N.] [PATCH v7 07/19] batman-adv: Rename batadv_backbone_gw *_free_ref function to *_put
Date: Sun, 17 Jan 2016 11:01:15 +0100	[thread overview]
Message-ID: <1453024887-7215-7-git-send-email-sven@narfation.org> (raw)
In-Reply-To: <1453024887-7215-1-git-send-email-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>
---
v7:
 - removed patches which are now applied in the branch master
 - split *_get -> *_put rename patches into smaller patches only renaming single
   functions
v6:
 - removed patches which are now applied in the branch next
 - rebased remaining patches on the patch
   "batman-adv: Avoid recursive call_rcu for batadv_nc_node" which was
   modified by Marek while he applied the patches (this unfortunately made
   some of the remaining patches slightly harder to apply)
v5:
 - add hack which allows to compile against stable kernel like 3.2.44 which
   also added the kref_get_unless_zero function
v4:
 - fix function names in commit messages
 - fix double whitespace in batadv_tt_orig_list_entry_release kerneldoc
 - add extra patch for batadv_claim_free_ref kerneldoc fix
 - change the phrase "free it" in all *_free_ref/*_put functions to "release it"
v3:
 - update copyright year
v2:
 - split patchset into fixes and kref migration to make it easier when the
   decision is made where each patch will be applied

 net/batman-adv/bridge_loop_avoidance.c | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/net/batman-adv/bridge_loop_avoidance.c b/net/batman-adv/bridge_loop_avoidance.c
index b7167cf..ce2d070 100644
--- a/net/batman-adv/bridge_loop_avoidance.c
+++ b/net/batman-adv/bridge_loop_avoidance.c
@@ -159,12 +159,11 @@ static void batadv_backbone_gw_release(struct kref *ref)
 }
 
 /**
- * batadv_backbone_gw_free_ref - decrement the backbone gw refcounter and
- *  possibly release it
+ * batadv_backbone_gw_put - decrement the backbone gw refcounter and possibly
+ *  release it
  * @backbone_gw: backbone gateway to be free'd
  */
-static void
-batadv_backbone_gw_free_ref(struct batadv_bla_backbone_gw *backbone_gw)
+static void batadv_backbone_gw_put(struct batadv_bla_backbone_gw *backbone_gw)
 {
 	kref_put(&backbone_gw->refcount, batadv_backbone_gw_release);
 }
@@ -180,7 +179,7 @@ static void batadv_claim_release(struct kref *ref)
 
 	claim = container_of(ref, struct batadv_bla_claim, refcount);
 
-	batadv_backbone_gw_free_ref(claim->backbone_gw);
+	batadv_backbone_gw_put(claim->backbone_gw);
 	kfree_rcu(claim, rcu);
 }
 
@@ -524,7 +523,7 @@ batadv_bla_update_own_backbone_gw(struct batadv_priv *bat_priv,
 		return;
 
 	backbone_gw->lasttime = jiffies;
-	batadv_backbone_gw_free_ref(backbone_gw);
+	batadv_backbone_gw_put(backbone_gw);
 }
 
 /**
@@ -573,7 +572,7 @@ static void batadv_bla_answer_request(struct batadv_priv *bat_priv,
 
 	/* finally, send an announcement frame */
 	batadv_bla_send_announce(bat_priv, backbone_gw);
-	batadv_backbone_gw_free_ref(backbone_gw);
+	batadv_backbone_gw_put(backbone_gw);
 }
 
 /**
@@ -682,7 +681,7 @@ static void batadv_bla_add_claim(struct batadv_priv *bat_priv,
 		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);
-		batadv_backbone_gw_free_ref(claim->backbone_gw);
+		batadv_backbone_gw_put(claim->backbone_gw);
 	}
 	/* set (new) backbone gw */
 	kref_get(&backbone_gw->refcount);
@@ -783,7 +782,7 @@ static int batadv_handle_announce(struct batadv_priv *bat_priv, u8 *an_addr,
 		}
 	}
 
-	batadv_backbone_gw_free_ref(backbone_gw);
+	batadv_backbone_gw_put(backbone_gw);
 	return 1;
 }
 
@@ -854,7 +853,7 @@ static int batadv_handle_unclaim(struct batadv_priv *bat_priv,
 		   claim_addr, BATADV_PRINT_VID(vid), backbone_gw->orig);
 
 	batadv_bla_del_claim(bat_priv, claim_addr, vid);
-	batadv_backbone_gw_free_ref(backbone_gw);
+	batadv_backbone_gw_put(backbone_gw);
 	return 1;
 }
 
@@ -891,7 +890,7 @@ static int batadv_handle_claim(struct batadv_priv *bat_priv,
 
 	/* TODO: we could call something like tt_local_del() here. */
 
-	batadv_backbone_gw_free_ref(backbone_gw);
+	batadv_backbone_gw_put(backbone_gw);
 	return 1;
 }
 
@@ -1154,7 +1153,7 @@ purge_now:
 			batadv_bla_del_backbone_claims(backbone_gw);
 
 			hlist_del_rcu(&backbone_gw->hash_entry);
-			batadv_backbone_gw_free_ref(backbone_gw);
+			batadv_backbone_gw_put(backbone_gw);
 		}
 		spin_unlock_bh(list_lock);
 	}
@@ -1571,7 +1570,7 @@ int batadv_bla_is_backbone_gw(struct sk_buff *skb,
 	if (!backbone_gw)
 		return 0;
 
-	batadv_backbone_gw_free_ref(backbone_gw);
+	batadv_backbone_gw_put(backbone_gw);
 	return 1;
 }
 
-- 
2.7.0.rc3


  parent reply	other threads:[~2016-01-17 10:01 UTC|newest]

Thread overview: 38+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-01-17 10:01 [B.A.T.M.A.N.] [PATCH v7 01/19] batman-adv: Rename batadv_orig_node *_free_ref function to *_put Sven Eckelmann
2016-01-17 10:01 ` [B.A.T.M.A.N.] [PATCH v7 02/19] batman-adv: Rename batadv_hardif " Sven Eckelmann
2016-01-17 11:54   ` Marek Lindner
2016-01-17 10:01 ` [B.A.T.M.A.N.] [PATCH v7 03/19] batman-adv: Rename batadv_neigh_node " Sven Eckelmann
2016-01-17 11:57   ` Marek Lindner
2016-01-17 10:01 ` [B.A.T.M.A.N.] [PATCH v7 04/19] batman-adv: Rename batadv_neigh_ifinfo " Sven Eckelmann
2016-01-17 11:58   ` Marek Lindner
2016-01-17 10:01 ` [B.A.T.M.A.N.] [PATCH v7 05/19] batman-adv: Rename batadv_orig_ifinfo " Sven Eckelmann
2016-01-17 12:00   ` Marek Lindner
2016-01-17 10:01 ` [B.A.T.M.A.N.] [PATCH v7 06/19] batman-adv: Rename batadv_hardif_neigh " Sven Eckelmann
2016-01-17 12:01   ` Marek Lindner
2016-01-17 10:01 ` Sven Eckelmann [this message]
2016-01-17 12:03   ` [B.A.T.M.A.N.] [PATCH v7 07/19] batman-adv: Rename batadv_backbone_gw " Marek Lindner
2016-01-17 10:01 ` [B.A.T.M.A.N.] [PATCH v7 08/19] batman-adv: Rename batadv_claim " Sven Eckelmann
2016-01-17 12:08   ` Marek Lindner
2016-01-17 10:01 ` [B.A.T.M.A.N.] [PATCH v7 09/19] batman-adv: Rename batadv_dat_entry " Sven Eckelmann
2016-01-17 12:10   ` Marek Lindner
2016-01-17 10:01 ` [B.A.T.M.A.N.] [PATCH v7 10/19] batman-adv: Rename batadv_gw_node " Sven Eckelmann
2016-01-17 12:12   ` Marek Lindner
2016-01-17 10:01 ` [B.A.T.M.A.N.] [PATCH v7 11/19] batman-adv: Rename batadv_tvlv_handler " Sven Eckelmann
2016-01-18  1:31   ` Marek Lindner
2016-01-17 10:01 ` [B.A.T.M.A.N.] [PATCH v7 12/19] batman-adv: Rename batadv_tvlv_container " Sven Eckelmann
2016-01-18  1:32   ` Marek Lindner
2016-01-17 10:01 ` [B.A.T.M.A.N.] [PATCH v7 13/19] batman-adv: Rename batadv_softif_vlan " Sven Eckelmann
2016-01-18  4:50   ` Marek Lindner
2016-01-17 10:01 ` [B.A.T.M.A.N.] [PATCH v7 14/19] batman-adv: Rename batadv_nc_node " Sven Eckelmann
2016-01-18  5:40   ` Marek Lindner
2016-01-17 10:01 ` [B.A.T.M.A.N.] [PATCH v7 15/19] batman-adv: Rename batadv_nc_path " Sven Eckelmann
2016-01-18  5:45   ` Marek Lindner
2016-01-17 10:01 ` [B.A.T.M.A.N.] [PATCH v7 16/19] batman-adv: Rename batadv_orig_node_vlan " Sven Eckelmann
2016-01-18  5:46   ` Marek Lindner
2016-01-17 10:01 ` [B.A.T.M.A.N.] [PATCH v7 17/19] batman-adv: Rename batadv_tt_local_entry " Sven Eckelmann
2016-01-18  5:48   ` Marek Lindner
2016-01-17 10:01 ` [B.A.T.M.A.N.] [PATCH v7 18/19] batman-adv: Rename batadv_tt_global_entry " Sven Eckelmann
2016-01-18  5:49   ` Marek Lindner
2016-01-17 10:01 ` [B.A.T.M.A.N.] [PATCH v7 19/19] batman-adv: Rename batadv_tt_orig_list_entry " Sven Eckelmann
2016-01-18  5:51   ` Marek Lindner
2016-01-17 11:52 ` [B.A.T.M.A.N.] [PATCH v7 01/19] batman-adv: Rename batadv_orig_node " Marek Lindner

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=1453024887-7215-7-git-send-email-sven@narfation.org \
    --to=sven@narfation.org \
    --cc=b.a.t.m.a.n@lists.open-mesh.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