From patchwork Sun Mar 23 19:11:13 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Monam Agarwal X-Patchwork-Id: 332905 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id AFC6D2C00C2 for ; Mon, 24 Mar 2014 06:14:55 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752135AbaCWTMP (ORCPT ); Sun, 23 Mar 2014 15:12:15 -0400 Received: from mail-pb0-f44.google.com ([209.85.160.44]:47891 "EHLO mail-pb0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751066AbaCWTMN (ORCPT ); Sun, 23 Mar 2014 15:12:13 -0400 Received: by mail-pb0-f44.google.com with SMTP id rp16so4509711pbb.17 for ; Sun, 23 Mar 2014 12:12:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:message-id; bh=TBAN1W9rlNjhbb+ZVmjKIpGArXpE5IaIhbp4u7HYRbs=; b=XYfWNGzibOZCdh4gLelF8JaWQorgd6jC69Z58pwTttpb8H7U0H24MLSuY3SHJ+npo9 D5xawNaB8nwlnEamBKeQBr9Fj/3FpiJ+A9xehJ7R4LZPhb+VOFjfy+Ofu7myWViLQm8x AuEKMW5meiJlpWYYBT7FZF/QxP+/dWGZ0lY8/gb+GBnCPkcaPw+V33tzQBs/aV633S8d oShivTjz2ItQI7+DnW+E3MaPZBwdb4Ymld0NMGTYmcoprzhcLPJM0Ie9+mm1mFtSgXUE ky6wjx/OAhzvZyyFc0ukLgIAHmwskUFVgpVQNlh3cTFoULHdYw+KIqzNduK3Ke5Lh2IL +NqQ== X-Received: by 10.68.240.5 with SMTP id vw5mr66670796pbc.113.1395601932977; Sun, 23 Mar 2014 12:12:12 -0700 (PDT) Received: from hacker.iiit.ac.in ([14.139.82.6]) by mx.google.com with ESMTPSA id kl1sm14666006pbd.73.2014.03.23.12.12.09 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 23 Mar 2014 12:12:12 -0700 (PDT) From: Monam Agarwal To: stephen@networkplumber.org, davem@davemloft.net, bridge@lists.linux-foundation.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] net/bridge: Use RCU_INIT_POINTER(x, NULL) in br_vlan.c Date: Mon, 24 Mar 2014 00:41:13 +0530 Message-Id: <1395601873-12447-1-git-send-email-monamagarwal123@gmail.com> X-Mailer: git-send-email 1.7.9.5 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This patch replaces rcu_assign_pointer(x, NULL) with RCU_INIT_POINTER(x, NULL) The rcu_assign_pointer() ensures that the initialization of a structure is carried out before storing a pointer to that structure. And in the case of the NULL pointer, there is no structure to initialize. So, rcu_assign_pointer(p, NULL) can be safely converted to RCU_INIT_POINTER(p, NULL) Signed-off-by: Monam Agarwal --- net/bridge/br_vlan.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/net/bridge/br_vlan.c b/net/bridge/br_vlan.c index 8249ca7..5d5b101 100644 --- a/net/bridge/br_vlan.c +++ b/net/bridge/br_vlan.c @@ -99,9 +99,9 @@ static int __vlan_del(struct net_port_vlans *v, u16 vid) v->num_vlans--; if (bitmap_empty(v->vlan_bitmap, VLAN_N_VID)) { if (v->port_idx) - rcu_assign_pointer(v->parent.port->vlan_info, NULL); + RCU_INIT_POINTER(v->parent.port->vlan_info, NULL); else - rcu_assign_pointer(v->parent.br->vlan_info, NULL); + RCU_INIT_POINTER(v->parent.br->vlan_info, NULL); kfree_rcu(v, rcu); } return 0; @@ -113,9 +113,9 @@ static void __vlan_flush(struct net_port_vlans *v) v->pvid = 0; bitmap_zero(v->vlan_bitmap, VLAN_N_VID); if (v->port_idx) - rcu_assign_pointer(v->parent.port->vlan_info, NULL); + RCU_INIT_POINTER(v->parent.port->vlan_info, NULL); else - rcu_assign_pointer(v->parent.br->vlan_info, NULL); + RCU_INIT_POINTER(v->parent.br->vlan_info, NULL); kfree_rcu(v, rcu); }