From patchwork Wed Sep 22 01:24:25 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: andrew hendry X-Patchwork-Id: 65389 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 4C694B70F3 for ; Wed, 22 Sep 2010 11:24:40 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755609Ab0IVBYg (ORCPT ); Tue, 21 Sep 2010 21:24:36 -0400 Received: from mail-qw0-f46.google.com ([209.85.216.46]:33015 "EHLO mail-qw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755547Ab0IVBYf (ORCPT ); Tue, 21 Sep 2010 21:24:35 -0400 Received: by qwh6 with SMTP id 6so4818232qwh.19 for ; Tue, 21 Sep 2010 18:24:34 -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=ekmzfISTmbdlnsTmM5SNV9CjtSXUmt/LS/UYnhg7jBw=; b=Bp7iopgH0Z8Y9LpUuD3rlZsl3B7UCJMXpoTYrhTz3BF5EgT7ZI2ggWMvUxJ6h8pGvB VufckI1vAHxpdArGI4bnZtN0zKulBpFX4IQrls8Pi1Z9grgtCrGK+mk5s085jXbZNKEp oQUMQ7u6hoq6JVUtrOOcW7tSqOsxpBtvA8bC8= 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=Fxqe6ZxQrisXReVK0u/hZldQWJN5E7vF4SVY9Uf17SufjSQfzWNYB4iPYfPxv1ZvLp 3PwvNdRypy4XFC7ctLecL/ftNqaj//3HeHcvW46GuQFLBCgZhl+ut8llqOCctA2it734 sNndttHuaGe4tez+nQmgIELVBXn3Lh75FiZT8= Received: by 10.220.53.138 with SMTP id m10mr2590192vcg.164.1285118671688; Tue, 21 Sep 2010 18:24:31 -0700 (PDT) Received: from [192.168.0.3] (124-168-111-76.dyn.iinet.net.au [124.168.111.76]) by mx.google.com with ESMTPS id z14sm3547672vch.34.2010.09.21.18.24.28 (version=SSLv3 cipher=RC4-MD5); Tue, 21 Sep 2010 18:24:30 -0700 (PDT) Subject: [PATCH 1/2] X.25 remove bkl in getsockname From: Andrew Hendry To: netdev@vger.kernel.org Date: Wed, 22 Sep 2010 11:24:25 +1000 Message-ID: <1285118665.28503.44.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 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 b371a47..a87f792 100644 --- a/net/x25/af_x25.c +++ b/net/x25/af_x25.c @@ -905,7 +905,6 @@ static int x25_getname(struct socket *sock, struct sockaddr *uaddr, struct x25_sock *x25 = x25_sk(sk); int rc = 0; - lock_kernel(); if (peer) { if (sk->sk_state != TCP_ESTABLISHED) { rc = -ENOTCONN; @@ -919,7 +918,6 @@ static int x25_getname(struct socket *sock, struct sockaddr *uaddr, *uaddr_len = sizeof(*sx25); out: - unlock_kernel(); return rc; }