From patchwork Tue Sep 14 23:32:03 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: andrew hendry X-Patchwork-Id: 64768 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 B3D98B70AF for ; Wed, 15 Sep 2010 09:32:14 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755391Ab0INXcK (ORCPT ); Tue, 14 Sep 2010 19:32:10 -0400 Received: from mail-vw0-f46.google.com ([209.85.212.46]:59587 "EHLO mail-vw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755138Ab0INXcI (ORCPT ); Tue, 14 Sep 2010 19:32:08 -0400 Received: by mail-vw0-f46.google.com with SMTP id 3so439029vws.19 for ; Tue, 14 Sep 2010 16:32:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:subject:from:to:content-type :date:message-id:mime-version:x-mailer:content-transfer-encoding; bh=4fqoP7OLBEFgBw5f5CdL1AoBfK1TiLjsQOc9h+xCgto=; b=XSkEaCrKA8pHtpxK3DmFIJRRxR8i56RdePetsdLBYe5B1QOLL4/fyHrf8gat3ukzmf t9oQpq8NjJjlC0SJcSbEcSKBZokripQG60Upf29N3HumcEHVkkSM4VjwpOwg/sdC9V14 hP5XOQISJgrsOSh9oUZjgn403RtuG/SvqH6Uk= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=subject:from:to:content-type:date:message-id:mime-version:x-mailer :content-transfer-encoding; b=l0GaPdVyA5hIF0m9UoNPfYBpVOjE3oLgQa36ytVrAdrknRWC06e8e4y0jOFoXcIOSK ZfmGvbM3wyM4VU8lDmCLfSFWCMTubZ+QyY4Cyd3LjZjav0/Sl0x3nZLwMPj3nRPXMTiI MQU2DNxM44TctjX0iEMoSehMaU0owfsBAHGJo= Received: by 10.220.123.215 with SMTP id q23mr343461vcr.178.1284507128422; Tue, 14 Sep 2010 16:32:08 -0700 (PDT) Received: from [192.168.0.3] (124-168-120-nwork.dyn.iinet.net.au [124.168.120.0]) by mx.google.com with ESMTPS id z14sm83105vch.34.2010.09.14.16.32.06 (version=SSLv3 cipher=RC4-MD5); Tue, 14 Sep 2010 16:32:07 -0700 (PDT) Subject: [PATCH 4/4] X.25 remove bkl in connect From: Andrew Hendry To: netdev@vger.kernel.org Date: Wed, 15 Sep 2010 09:32:03 +1000 Message-ID: <1284507123.1742.57.camel@jaunty> Mime-Version: 1.0 X-Mailer: Evolution 2.28.3 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Connect already has socket locking. Signed-off-by: Andrew Hendry --- net/x25/af_x25.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/net/x25/af_x25.c b/net/x25/af_x25.c index bd6fce3..ab959d0 100644 --- a/net/x25/af_x25.c +++ b/net/x25/af_x25.c @@ -751,7 +751,6 @@ static int x25_connect(struct socket *sock, struct sockaddr *uaddr, struct x25_route *rt; int rc = 0; - lock_kernel(); lock_sock(sk); if (sk->sk_state == TCP_ESTABLISHED && sock->state == SS_CONNECTING) { sock->state = SS_CONNECTED; @@ -829,7 +828,6 @@ out_put_route: x25_route_put(rt); out: release_sock(sk); - unlock_kernel(); return rc; }