From patchwork Wed Dec 1 11:37:42 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Eric Dumazet X-Patchwork-Id: 73800 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 68095B6F11 for ; Wed, 1 Dec 2010 22:38:20 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753339Ab0LALht (ORCPT ); Wed, 1 Dec 2010 06:37:49 -0500 Received: from mail-ww0-f44.google.com ([74.125.82.44]:33345 "EHLO mail-ww0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751417Ab0LALhs (ORCPT ); Wed, 1 Dec 2010 06:37:48 -0500 Received: by wwa36 with SMTP id 36so7274120wwa.1 for ; Wed, 01 Dec 2010 03:37:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:subject:from:to:cc :in-reply-to:references:content-type:date:message-id:mime-version :x-mailer:content-transfer-encoding; bh=e+b7Hu1iplHoJjS/FvwOQL4BgaI5TcOiRClrDBK/H5w=; b=fJBBeobyGcsekPz5ELKfVm+sJdPO2fuUZtQw851xPzsA3QibGB1TA+LmmuXeAQvpCo g6vekQkGFK+IOoD/xJkObzfVv/46ChpYTgY/2BCUz4kbYwhB/5P4Wmdub4EMcPDJWuy2 ZHVh+Dr12C17+Av3dl2Yys7cxM2/jDJ16ICf4= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=subject:from:to:cc:in-reply-to:references:content-type:date :message-id:mime-version:x-mailer:content-transfer-encoding; b=lI+cazJjDWOUUl515kRgal172UtxCXsmy+IJDStpvLUUQfH7b25OIJHyyxBHALBlA5 iAX+bU4kH2vUfbync1hkgjUSby6hDEVc3Gvi/mIBkgpO6AKbhnmiEIIZY0OyVCLslglb 7tkEEwifYSY4FXC1T3HZFUzVEtV32l62NdZqc= Received: by 10.227.127.199 with SMTP id h7mr1554226wbs.187.1291203466494; Wed, 01 Dec 2010 03:37:46 -0800 (PST) Received: from [192.168.1.21] (13.237.66-86.rev.gaoland.net [86.66.237.13]) by mx.google.com with ESMTPS id 11sm2734497wbj.19.2010.12.01.03.37.44 (version=SSLv3 cipher=RC4-MD5); Wed, 01 Dec 2010 03:37:45 -0800 (PST) Subject: [PATCH net-next-2.6] : __in_dev_get_rtnl() can use rtnl_dereference() From: Eric Dumazet To: Amerigo Wang Cc: linux-kernel@vger.kernel.org, "David S. Miller" , Alexey Kuznetsov , "Pekka Savola (ipv6)" , James Morris , Hideaki YOSHIFUJI , Patrick McHardy , netdev@vger.kernel.org In-Reply-To: <1291202476.2856.584.camel@edumazet-laptop> References: <1291202063-6239-1-git-send-email-amwang@redhat.com> <1291202476.2856.584.camel@edumazet-laptop> Date: Wed, 01 Dec 2010 12:37:42 +0100 Message-ID: <1291203462.2856.607.camel@edumazet-laptop> Mime-Version: 1.0 X-Mailer: Evolution 2.30.3 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Le mercredi 01 décembre 2010 à 12:21 +0100, Eric Dumazet a écrit : > Same here. RTNL is held. Please use __in_dev_get_rtnl() By the way we can use rtnl_dereference() in __in_dev_get_rtnl() [PATCH net-next-2.6] : __in_dev_get_rtnl() can use rtnl_dereference() If caller holds RTNL, we dont need a memory barrier (smp_read_barrier_depends) included in rcu_dereference(). Just use rtnl_dereference() to properly document the assertions. Signed-off-by: Eric Dumazet --- include/linux/inetdevice.h | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) -- 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/include/linux/inetdevice.h b/include/linux/inetdevice.h index 2b86eaf..ae8fdc5 100644 --- a/include/linux/inetdevice.h +++ b/include/linux/inetdevice.h @@ -222,7 +222,7 @@ static inline struct in_device *in_dev_get(const struct net_device *dev) static inline struct in_device *__in_dev_get_rtnl(const struct net_device *dev) { - return rcu_dereference_check(dev->ip_ptr, lockdep_rtnl_is_held()); + return rtnl_dereference(dev->ip_ptr); } extern void in_dev_finish_destroy(struct in_device *idev);