From patchwork Mon May 17 09:00:35 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: andrew hendry X-Patchwork-Id: 52769 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 7106DB7DB2 for ; Mon, 17 May 2010 19:01:04 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754840Ab0EQJAn (ORCPT ); Mon, 17 May 2010 05:00:43 -0400 Received: from mail-px0-f174.google.com ([209.85.212.174]:34564 "EHLO mail-px0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754391Ab0EQJAl (ORCPT ); Mon, 17 May 2010 05:00:41 -0400 Received: by pxi5 with SMTP id 5so2420744pxi.19 for ; Mon, 17 May 2010 02:00:41 -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=YpM4UHH6zL/XSbe0F3bGP1HprSxEBjLd6HkdEiPp1RA=; b=MfX3ZXfHZxPn/9WBJQlcBzImW7YrCAuUu3tTkyxoHWZxoeFN+UkfP1hSpLnFA7UnW7 zbIf7MJ/wn6HDjd4qpVlbRzeqeI/QkrVrfsu4euHmhKJqda2DYl/aHv+YheoxWuY3K+l dukyxFmSKDL1d1pqM1qFotAaYup2JSaztEfzE= 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=G2rR7uw0dwOi39HJO7dPcVbgV/bzbek81zq7TaFnO9NPvAiysgT96OmYJgE5jORkOm ZUBUFPCh4DHehoet99MkVQU4x7f3c0i+U2t4T8iMHZBVGcv84KWpGSr0GLbJNCPcvVzV R1gRROkgcG8FnrJS17V2tV3XQDWmK211Ns24s= Received: by 10.142.3.26 with SMTP id 26mr3129072wfc.165.1274086841024; Mon, 17 May 2010 02:00:41 -0700 (PDT) Received: from [192.168.0.8] (210-84-37-193.dyn.iinet.net.au [210.84.37.193]) by mx.google.com with ESMTPS id 22sm3840376pzk.1.2010.05.17.02.00.38 (version=SSLv3 cipher=RC4-MD5); Mon, 17 May 2010 02:00:40 -0700 (PDT) Subject: [PATCH 4/4] X25: Remove bkl in sockopts From: Andrew Hendry To: netdev@vger.kernel.org Date: Mon, 17 May 2010 19:00:35 +1000 Message-ID: <1274086835.4104.55.camel@ibex> 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 Removes the BKL in x25 setsock and getsockopts. Signed-off-by: Andrew Hendry --- net/x25/af_x25.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/net/x25/af_x25.c b/net/x25/af_x25.c index e5c1e32..5e86d4e 100644 --- a/net/x25/af_x25.c +++ b/net/x25/af_x25.c @@ -453,7 +453,6 @@ static int x25_setsockopt(struct socket *sock, int level, int optname, struct sock *sk = sock->sk; int rc = -ENOPROTOOPT; - lock_kernel(); if (level != SOL_X25 || optname != X25_QBITINCL) goto out; @@ -471,7 +470,6 @@ static int x25_setsockopt(struct socket *sock, int level, int optname, clear_bit(X25_Q_BIT_FLAG, &x25_sk(sk)->flags); rc = 0; out: - unlock_kernel(); return rc; } @@ -481,7 +479,6 @@ static int x25_getsockopt(struct socket *sock, int level, int optname, struct sock *sk = sock->sk; int val, len, rc = -ENOPROTOOPT; - lock_kernel(); if (level != SOL_X25 || optname != X25_QBITINCL) goto out; @@ -502,7 +499,6 @@ static int x25_getsockopt(struct socket *sock, int level, int optname, val = test_bit(X25_Q_BIT_FLAG, &x25_sk(sk)->flags); rc = copy_to_user(optval, &val, len) ? -EFAULT : 0; out: - unlock_kernel(); return rc; }