From patchwork Fri Jul 15 15:39:31 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sven Eckelmann X-Patchwork-Id: 16528 X-Patchwork-Delegate: mareklindner@neomailbox.ch Return-Path: X-Original-To: patchwork@open-mesh.org Delivered-To: patchwork@open-mesh.org Received: from open-mesh.org (localhost [IPv6:::1]) by open-mesh.org (Postfix) with ESMTP id 5D70C82CE0; Fri, 15 Jul 2016 17:42:31 +0200 (CEST) Authentication-Results: open-mesh.org; dmarc=none header.from=narfation.org Authentication-Results: open-mesh.org; dkim=fail reason="verification failed; unprotected key" header.d=narfation.org header.i=@narfation.org header.b=d84en9O2; dkim-adsp=fail (unprotected policy); dkim-atps=neutral Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2001:4d88:2000:7::2; helo=v3-1039.vlinux.de; envelope-from=sven@narfation.org; receiver=b.a.t.m.a.n@lists.open-mesh.org Authentication-Results: open-mesh.org; dmarc=pass header.from=narfation.org Received: from v3-1039.vlinux.de (narfation.org [IPv6:2001:4d88:2000:7::2]) by open-mesh.org (Postfix) with ESMTPS id 58B1D82C9F for ; Fri, 15 Jul 2016 17:39:57 +0200 (CEST) Received: from sven-desktop.home.narfation.org (p2003007C6F79CCFEDCC073B09CC56703.dip0.t-ipconnect.de [IPv6:2003:7c:6f79:ccfe:dcc0:73b0:9cc5:6703]) by v3-1039.vlinux.de (Postfix) with ESMTPSA id 93D1011010B; Fri, 15 Jul 2016 17:39:56 +0200 (CEST) Authentication-Results: v3-1039.vlinux.de; dmarc=none header.from=narfation.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=narfation.org; s=20121; t=1468597196; bh=WuLkkRJQK7HcP+lmZa40hqViMaEzo0blxYIMt1CQBAI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=d84en9O2hJ5ZTkNGNxHmo7JMZHIDoz/sdtWdt08rNvGSSr9rZ8PfmCCVA7r21hMmy lD0fQtaKrMerK98li1q35dJC581GZItIlA0zuFi0EYXNticWX7nxsm0ZTR64MQN7O6 AOU2zEoGmUP6zVHX53x/DW4wmYAEVhSEjF3n9U7A= From: Sven Eckelmann To: b.a.t.m.a.n@lists.open-mesh.org Date: Fri, 15 Jul 2016 17:39:31 +0200 Message-Id: <1468597173-25378-16-git-send-email-sven@narfation.org> X-Mailer: git-send-email 2.8.1 In-Reply-To: <1468597173-25378-1-git-send-email-sven@narfation.org> References: <1468597173-25378-1-git-send-email-sven@narfation.org> Subject: [B.A.T.M.A.N.] [PATCH v2 16/18] batman-adv: Place kref_get for nc_path near use X-BeenThere: b.a.t.m.a.n@lists.open-mesh.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: The list for a Better Approach To Mobile Ad-hoc Networking List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: The list for a Better Approach To Mobile Ad-hoc Networking Errors-To: b.a.t.m.a.n-bounces@lists.open-mesh.org Sender: "B.A.T.M.A.N" It is hard to understand why the refcnt is increased when it isn't done near the actual place the new reference is used. So using kref_get right before the place which requires the reference and in the same function helps to avoid accidental problems causedy incorrect reference counting. Signed-off-by: Sven Eckelmann --- v2: - split patch based on type net/batman-adv/network-coding.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/batman-adv/network-coding.c b/net/batman-adv/network-coding.c index 4f4cfe5..165cd27 100644 --- a/net/batman-adv/network-coding.c +++ b/net/batman-adv/network-coding.c @@ -978,7 +978,6 @@ static struct batadv_nc_path *batadv_nc_get_path(struct batadv_priv *bat_priv, INIT_LIST_HEAD(&nc_path->packet_list); spin_lock_init(&nc_path->packet_list_lock); kref_init(&nc_path->refcount); - kref_get(&nc_path->refcount); nc_path->last_valid = jiffies; ether_addr_copy(nc_path->next_hop, dst); ether_addr_copy(nc_path->prev_hop, src); @@ -988,6 +987,7 @@ static struct batadv_nc_path *batadv_nc_get_path(struct batadv_priv *bat_priv, nc_path->next_hop); /* Add nc_path to hash table */ + kref_get(&nc_path->refcount); hash_added = batadv_hash_add(hash, batadv_nc_hash_compare, batadv_nc_hash_choose, &nc_path_key, &nc_path->hash_entry);