From: Antonio Quartulli <antonio@meshcoding.com>
To: davem@davemloft.net
Cc: netdev@vger.kernel.org, b.a.t.m.a.n@lists.open-mesh.org,
Marek Lindner <mareklindner@neomailbox.ch>,
Antonio Quartulli <antonio@meshcoding.com>
Subject: [B.A.T.M.A.N.] [PATCH 01/10] batman-adv: move hardif refcount inc to batadv_neigh_node_new()
Date: Fri, 28 Aug 2015 11:12:27 +0200 [thread overview]
Message-ID: <1440753156-7808-2-git-send-email-antonio@meshcoding.com> (raw)
In-Reply-To: <1440753156-7808-1-git-send-email-antonio@meshcoding.com>
From: Marek Lindner <mareklindner@neomailbox.ch>
The batadv_neigh_node cleanup function 'batadv_neigh_node_free_rcu()'
takes care of reducing the hardif refcounter, hence it's only logical
to assume the creating function of that same object
'batadv_neigh_node_new()' takes care of increasing the same refcounter.
Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
Acked-by: Simon Wunderlich <sw@simonwunderlich.de>
Signed-off-by: Antonio Quartulli <antonio@meshcoding.com>
---
net/batman-adv/bat_iv_ogm.c | 6 ------
net/batman-adv/originator.c | 6 ++++++
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c
index 5c12200..b9b8b33 100644
--- a/net/batman-adv/bat_iv_ogm.c
+++ b/net/batman-adv/bat_iv_ogm.c
@@ -303,12 +303,6 @@ batadv_iv_ogm_neigh_new(struct batadv_hard_iface *hard_iface,
if (!neigh_node)
goto out;
- if (!atomic_inc_not_zero(&hard_iface->refcount)) {
- kfree(neigh_node);
- neigh_node = NULL;
- goto out;
- }
-
neigh_node->orig_node = orig_neigh;
neigh_node->if_incoming = hard_iface;
diff --git a/net/batman-adv/originator.c b/net/batman-adv/originator.c
index 610620a..f8317c1 100644
--- a/net/batman-adv/originator.c
+++ b/net/batman-adv/originator.c
@@ -461,6 +461,12 @@ batadv_neigh_node_new(struct batadv_hard_iface *hard_iface,
if (!neigh_node)
goto out;
+ if (!atomic_inc_not_zero(&hard_iface->refcount)) {
+ kfree(neigh_node);
+ neigh_node = NULL;
+ goto out;
+ }
+
INIT_HLIST_NODE(&neigh_node->list);
INIT_HLIST_HEAD(&neigh_node->ifinfo_list);
spin_lock_init(&neigh_node->ifinfo_lock);
--
2.5.0
next prev parent reply other threads:[~2015-08-28 9:12 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-08-28 9:12 [B.A.T.M.A.N.] pull request: batman-adv 20150828 Antonio Quartulli
2015-08-28 9:12 ` Antonio Quartulli [this message]
2015-08-28 9:12 ` [B.A.T.M.A.N.] [PATCH 02/10] batman-adv: remove redundant hard_iface assignment Antonio Quartulli
2015-08-28 9:12 ` [B.A.T.M.A.N.] [PATCH 03/10] batman-adv: move neigh_node list add into batadv_neigh_node_new() Antonio Quartulli
2015-08-28 9:12 ` [B.A.T.M.A.N.] [PATCH 04/10] batman-adv: remove obsolete deleted attribute for gateway node Antonio Quartulli
2015-08-28 9:12 ` [B.A.T.M.A.N.] [PATCH 05/10] batman-adv: rearrange batadv_neigh_node_new() arguments to follow convention Antonio Quartulli
2015-08-28 9:12 ` [B.A.T.M.A.N.] [PATCH 06/10] batman-adv: fix gateway client style issues Antonio Quartulli
2015-08-28 9:12 ` [B.A.T.M.A.N.] [PATCH 07/10] batman-adv: Start new development cycle Antonio Quartulli
2015-08-28 9:12 ` [B.A.T.M.A.N.] [PATCH 08/10] batman-adv: don't access unregistered net_device object Antonio Quartulli
2015-08-28 9:12 ` [B.A.T.M.A.N.] [PATCH 09/10] batman-adv: Add lower layer needed_(head|tail)room to own ones Antonio Quartulli
2015-08-28 9:12 ` [B.A.T.M.A.N.] [PATCH 10/10] batman-adv: turn batadv_neigh_node_get() into local function Antonio Quartulli
2015-08-28 20:44 ` [B.A.T.M.A.N.] pull request: batman-adv 20150828 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=1440753156-7808-2-git-send-email-antonio@meshcoding.com \
--to=antonio@meshcoding.com \
--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