From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932855AbaCRWpZ (ORCPT ); Tue, 18 Mar 2014 18:45:25 -0400 Received: from mail-pd0-f171.google.com ([209.85.192.171]:45257 "EHLO mail-pd0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757385AbaCRWpY (ORCPT ); Tue, 18 Mar 2014 18:45:24 -0400 From: Monam Agarwal To: netdev@vger.kernel.org Cc: linux-kernel@vger.kernel.org, eddie.wai@broadcom.com, paulmck@linux.vnet.ibm.com Subject: [PATCH 3/9] rcu: Replace rcu_assign_pointer(x, NULL) with RCU_INIT_POINTER(x, NULL) in drivers/net/macvtap.c Date: Wed, 19 Mar 2014 04:14:31 +0530 Message-Id: X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <23ae65fa8bad7f9092739a52e35fdf9d4e8576a3.1395182132.git.monamagarwal123@gmail.com> References: <23ae65fa8bad7f9092739a52e35fdf9d4e8576a3.1395182132.git.monamagarwal123@gmail.com> In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Signed-off-by: Monam Agarwal --- drivers/net/macvtap.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/net/macvtap.c b/drivers/net/macvtap.c index 1b7082d..7c88d13 100644 --- a/drivers/net/macvtap.c +++ b/drivers/net/macvtap.c @@ -145,8 +145,8 @@ static void macvtap_put_queue(struct macvtap_queue *q) if (vlan) { int index = get_slot(vlan, q); - rcu_assign_pointer(vlan->taps[index], NULL); - rcu_assign_pointer(q->vlan, NULL); + RCU_INIT_POINTER(vlan->taps[index], NULL); + RCU_INIT_POINTER(q->vlan, NULL); sock_put(&q->sk); --vlan->numvtaps; } @@ -223,8 +223,8 @@ static void macvtap_del_queues(struct net_device *dev) lockdep_is_held(&macvtap_lock)); if (q) { qlist[j++] = q; - rcu_assign_pointer(vlan->taps[i], NULL); - rcu_assign_pointer(q->vlan, NULL); + RCU_INIT_POINTER(vlan->taps[i], NULL); + RCU_INIT_POINTER(q->vlan, NULL); vlan->numvtaps--; } } -- 1.7.9.5