From patchwork Wed Feb 1 06:56:42 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Li Zefan X-Patchwork-Id: 138912 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 0B5F6B6EF7 for ; Wed, 1 Feb 2012 17:54:21 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755543Ab2BAGx7 (ORCPT ); Wed, 1 Feb 2012 01:53:59 -0500 Received: from cn.fujitsu.com ([222.73.24.84]:60543 "EHLO song.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1755144Ab2BAGx5 (ORCPT ); Wed, 1 Feb 2012 01:53:57 -0500 Received: from tang.cn.fujitsu.com (tang.cn.fujitsu.com [10.167.250.3]) by song.cn.fujitsu.com (Postfix) with ESMTP id EB39417013F; Wed, 1 Feb 2012 14:53:56 +0800 (CST) Received: from mailserver.fnst.cn.fujitsu.com (tang.cn.fujitsu.com [127.0.0.1]) by tang.cn.fujitsu.com (8.14.3/8.13.1) with ESMTP id q116runn000880; Wed, 1 Feb 2012 14:53:56 +0800 Received: from [10.167.225.230] ([10.167.225.230]) by mailserver.fnst.cn.fujitsu.com (Lotus Domino Release 8.5.1FP4) with ESMTP id 2012020114523554-478834 ; Wed, 1 Feb 2012 14:52:35 +0800 Message-ID: <4F28E22A.703@cn.fujitsu.com> Date: Wed, 01 Feb 2012 14:56:42 +0800 From: Li Zefan User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.2.9) Gecko/20100921 Fedora/3.1.4-1.fc14 Thunderbird/3.1.4 MIME-Version: 1.0 To: David Miller CC: netdev , LKML , Cgroups , Neil Horman Subject: [PATCH 6/6] cls_cgroup: remove redundant rcu_read_lock/unlock References: <4F28E1D1.900@cn.fujitsu.com> In-Reply-To: <4F28E1D1.900@cn.fujitsu.com> X-MIMETrack: Itemize by SMTP Server on mailserver/fnst(Release 8.5.1FP4|July 25, 2010) at 2012-02-01 14:52:35, Serialize by Router on mailserver/fnst(Release 8.5.1FP4|July 25, 2010) at 2012-02-01 14:52:35, Serialize complete at 2012-02-01 14:52:35 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org We've already used rcu_read_lock/unlock inside task_classid(), so don't use the lock/unlock pair twice in this hot path. Signed-off-by: Li Zefan --- net/core/sock.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/net/core/sock.c b/net/core/sock.c index 213c856..c0bab23 100644 --- a/net/core/sock.c +++ b/net/core/sock.c @@ -1160,9 +1160,7 @@ void sock_update_classid(struct sock *sk) { u32 classid; - rcu_read_lock(); /* doing current task, which cannot vanish. */ classid = task_cls_classid(current); - rcu_read_unlock(); if (classid && classid != sk->sk_classid) sk->sk_classid = classid; }