From patchwork Tue Sep 14 23:31:16 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: andrew hendry X-Patchwork-Id: 64765 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 F24BDB70A3 for ; Wed, 15 Sep 2010 09:31:26 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755010Ab0INXbW (ORCPT ); Tue, 14 Sep 2010 19:31:22 -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 S1752459Ab0INXbV (ORCPT ); Tue, 14 Sep 2010 19:31:21 -0400 Received: by vws3 with SMTP id 3so439029vws.19 for ; Tue, 14 Sep 2010 16:31:20 -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=oLZCTku+kP8irwdwmjmUsZ4HUeLnAu4SEzQtRNiZ1dI=; b=mHrDtU0986YDZ2T4li+lHR5iXvyh+IZJ0xZCiZ7te+EDZgSi3r3O6/rtcBXiDBuMXy 3sLqk0YPaLNQL4rqdjbfogG6eNR1fVQawRYjLtL6EpPlcM6Xstt8VO8g4Bi+fbspj82i Mk9mnRL1pcbV3v3DnZ2h2RUWF12gf+xrLgI6M= 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=q1p0Ro5aO+gLleOh1VmSPmV3+lEdKSrhIQ+vpTqvT+z4DjxR/MdkLk3wL8soK8xS00 h/nSoNHu5/YMgK6VOdnxDJCOvu+Xmkm7SoHwm614nEyC0WQ9HcyF4h9UhuPdiYgSAtl/ hj+p8/M4pUy8MUUKniXFjRqyTwyB1hBdP0q7Q= Received: by 10.220.128.200 with SMTP id l8mr398713vcs.33.1284507080804; Tue, 14 Sep 2010 16:31:20 -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 m30sm521034vbr.9.2010.09.14.16.31.18 (version=SSLv3 cipher=RC4-MD5); Tue, 14 Sep 2010 16:31:20 -0700 (PDT) Subject: [PATCH 1/4] X.25 remove bkl in listen From: Andrew Hendry To: netdev@vger.kernel.org Date: Wed, 15 Sep 2010 09:31:16 +1000 Message-ID: <1284507076.1742.51.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 Listen updates socket values and needs lock_sock. Signed-off-by: Andrew Hendry --- net/x25/af_x25.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/net/x25/af_x25.c b/net/x25/af_x25.c index 5e86d4e..f6a8f17 100644 --- a/net/x25/af_x25.c +++ b/net/x25/af_x25.c @@ -507,14 +507,14 @@ static int x25_listen(struct socket *sock, int backlog) struct sock *sk = sock->sk; int rc = -EOPNOTSUPP; - lock_kernel(); + lock_sock(sk); if (sk->sk_state != TCP_LISTEN) { memset(&x25_sk(sk)->dest_addr, 0, X25_ADDR_LEN); sk->sk_max_ack_backlog = backlog; sk->sk_state = TCP_LISTEN; rc = 0; } - unlock_kernel(); + release_sock(sk); return rc; }