From patchwork Tue Sep 14 23:31:50 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: andrew hendry X-Patchwork-Id: 64767 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 4C6C01007D2 for ; Wed, 15 Sep 2010 09:32:01 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755182Ab0INXb5 (ORCPT ); Tue, 14 Sep 2010 19:31:57 -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 S1755138Ab0INXb4 (ORCPT ); Tue, 14 Sep 2010 19:31:56 -0400 Received: by mail-vw0-f46.google.com with SMTP id 3so439029vws.19 for ; Tue, 14 Sep 2010 16:31:56 -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=HEn6Lthi9mxzhTxXTPRl/vnVRc5xZi/S+ZHVwElZUp8=; b=S000cUPLqcGUENMdsyCtjdNcS194HBqil97ZIQD1UkzJk1VfgUiOX/uI0ukS21Rpkw ewE5femLxXay8HT1+t5jNkK7mK2CLLsfUWvodGybSbI6xCRREO2dW39E2q9Kmty3/bjC AO5V90SXht3bfXgopQJSmEpwnlB+I1JqrwWMM= 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=jiXzbO4f8AVFfcUYR1zAyzly13kNO6cImZMsyHAat7MLnCb+YMVVpphzmnXKEOCIqa noF7Cl5QuPPwqL8yw40BFEk1EH/eABfoh83AKboalFyJHtZZz2ZuLPsXtud+EY9qAGg+ eP32XItau9bD54BduxVc3d18ZuiyF2/G2QCTs= Received: by 10.220.110.66 with SMTP id m2mr319878vcp.249.1284507115739; Tue, 14 Sep 2010 16:31:55 -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 f20sm444674vcm.42.2010.09.14.16.31.53 (version=SSLv3 cipher=RC4-MD5); Tue, 14 Sep 2010 16:31:55 -0700 (PDT) Subject: [PATCH 3/4] X.25 remove bkl in accept From: Andrew Hendry To: netdev@vger.kernel.org Date: Wed, 15 Sep 2010 09:31:50 +1000 Message-ID: <1284507110.1742.56.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 Accept 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 ab959d0..4ebde0d 100644 --- a/net/x25/af_x25.c +++ b/net/x25/af_x25.c @@ -867,7 +867,6 @@ static int x25_accept(struct socket *sock, struct socket *newsock, int flags) struct sk_buff *skb; int rc = -EINVAL; - lock_kernel(); if (!sk || sk->sk_state != TCP_LISTEN) goto out; @@ -895,7 +894,6 @@ static int x25_accept(struct socket *sock, struct socket *newsock, int flags) out2: release_sock(sk); out: - unlock_kernel(); return rc; }