From patchwork Tue Mar 18 22:44:31 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Monam Agarwal X-Patchwork-Id: 331558 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 1B9832C00AD for ; Wed, 19 Mar 2014 09:45:51 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932553AbaCRWpZ (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 Received: by mail-pd0-f171.google.com with SMTP id r10so7715708pdi.16 for ; Tue, 18 Mar 2014 15:45:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=Zsz4lMCsOn8yb3yL/iYrbOx4GYcmJ6SpPgHjkb+1GAc=; b=b4WLT53GTRG+rM4DY7OR+sJZ8OWSGdsczjgBlbn9BqgnbjRtroVY0dtAaTM8JWz0+w nmv8YjAztXk5yloE8fOOVZhAWMx3P1EG21KUdt/Pf6nBCsI7uw0wwZ3kEvdWuqDP9p+O p5+Fagi0qP1dCdXnY++jXRL/4kXjTylIErfA1NDXdbdAMcarUmEiJcbbciuMzuKMuHha TkhMJvb4MaWcIQVxvPn3sO8zjQvctfA8cYf9jd3ftmwXW7So3G5JpCVioMOM/7cFDVtS vXau+RwQpYLYkp25nMOSN10b6oFuK+mHkwZRz8EnGaVC7NdohfLGdZ56y5vwsPXL5ZAs L4gQ== X-Received: by 10.68.130.202 with SMTP id og10mr14027972pbb.133.1395182723708; Tue, 18 Mar 2014 15:45:23 -0700 (PDT) Received: from hacker.iiit.ac.in ([14.139.82.6]) by mx.google.com with ESMTPSA id kc9sm56035505pbc.25.2014.03.18.15.45.19 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 18 Mar 2014 15:45:21 -0700 (PDT) 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: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Signed-off-by: Monam Agarwal Reviewed-by: Paul E. McKenney --- 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--; } }