From patchwork Tue Sep 9 15:11:41 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Dumazet X-Patchwork-Id: 387364 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 47910140190 for ; Wed, 10 Sep 2014 01:11:48 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756644AbaIIPLo (ORCPT ); Tue, 9 Sep 2014 11:11:44 -0400 Received: from mail-pd0-f170.google.com ([209.85.192.170]:46180 "EHLO mail-pd0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753207AbaIIPLm (ORCPT ); Tue, 9 Sep 2014 11:11:42 -0400 Received: by mail-pd0-f170.google.com with SMTP id fp1so1433912pdb.15 for ; Tue, 09 Sep 2014 08:11:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=message-id:subject:from:to:cc:date:content-type :content-transfer-encoding:mime-version; bh=az1y95a59tRlsbYYJ5ya4IHW9Wf/6cfc0A1ihtJrrWo=; b=bMX+YZFGdIek03HKzrBbCRSonlVOuAFEnyLb6NrPYjdBkYukqdlfG4q/Yp1oRCLN07 20l92FfOGabpPyxUXQxqSO4W/yqeOogcTSPXYMSxjmZ/8YI2Qbg5OqHmz0ge7avqPSAX Bo3JoUBNIngoLLmD6cg6+IdyfZkKFMqePRQ4M8kudjXwPya5N/YQyLFctfIAdQmbGRVr GFW4KCgvaVxtUMzEfgxiF8lqJ7Z1ZQUg59YGxfmI+UwNrpI/O0IPK5qo2KP6juBgGK7K E6sdskPcszhYaMfKzOnEqr+AOv+Xm4ljN5vkG7GVtuNKshA95mbAR/h0NAYpEnI63YSM T0og== X-Received: by 10.67.29.227 with SMTP id jz3mr57457302pad.62.1410275502265; Tue, 09 Sep 2014 08:11:42 -0700 (PDT) Received: from [172.19.241.57] ([172.19.241.57]) by mx.google.com with ESMTPSA id ev5sm12044584pdb.79.2014.09.09.08.11.41 for (version=SSLv3 cipher=RC4-SHA bits=128/128); Tue, 09 Sep 2014 08:11:41 -0700 (PDT) Message-ID: <1410275501.7106.4.camel@edumazet-glaptop2.roam.corp.google.com> Subject: [PATCH net-next] ipv4: rcu cleanup in ip_ra_control() From: Eric Dumazet To: David Miller Cc: netdev Date: Tue, 09 Sep 2014 08:11:41 -0700 X-Mailer: Evolution 3.2.3-0ubuntu6 Mime-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Eric Dumazet Remove one sparse warning : net/ipv4/ip_sockglue.c:328:22: warning: incorrect type in assignment (different address spaces) net/ipv4/ip_sockglue.c:328:22: expected struct ip_ra_chain [noderef] *next net/ipv4/ip_sockglue.c:328:22: got struct ip_ra_chain *[assigned] ra And replace one rcu_assign_ptr() by RCU_INIT_POINTER() where applicable. Signed-off-by: Eric Dumazet --- net/ipv4/ip_sockglue.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/net/ipv4/ip_sockglue.c b/net/ipv4/ip_sockglue.c index 455e75bcb167..c373a9ad4555 100644 --- a/net/ipv4/ip_sockglue.c +++ b/net/ipv4/ip_sockglue.c @@ -303,7 +303,7 @@ int ip_ra_control(struct sock *sk, unsigned char on, } /* dont let ip_call_ra_chain() use sk again */ ra->sk = NULL; - rcu_assign_pointer(*rap, ra->next); + RCU_INIT_POINTER(*rap, ra->next); spin_unlock_bh(&ip_ra_lock); if (ra->destructor) @@ -325,7 +325,7 @@ int ip_ra_control(struct sock *sk, unsigned char on, new_ra->sk = sk; new_ra->destructor = destructor; - new_ra->next = ra; + RCU_INIT_POINTER(new_ra->next, ra); rcu_assign_pointer(*rap, new_ra); sock_hold(sk); spin_unlock_bh(&ip_ra_lock);