From patchwork Thu Nov 18 23:21: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: 72169 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 9EC79B71CB for ; Fri, 19 Nov 2010 10:21:44 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760829Ab0KRXVk (ORCPT ); Thu, 18 Nov 2010 18:21:40 -0500 Received: from mail-vw0-f46.google.com ([209.85.212.46]:56454 "EHLO mail-vw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1760816Ab0KRXVk (ORCPT ); Thu, 18 Nov 2010 18:21:40 -0500 Received: by mail-vw0-f46.google.com with SMTP id 13so2163943vws.19 for ; Thu, 18 Nov 2010 15:21:39 -0800 (PST) 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=5K5qjxTgI4+mZgUPddesQu8quuRuasxBlCGESG9kdRo=; b=PiCOQlUawZqFOXmdK3RAfIntb3eWfqUdsx7D+h6R5xBNmIHbFsm72Ec8Y1Id2NihGS RshePqudH1CjIKm9lkMJmQveDZsIBSksK1H9B4vL65277fy9WU/0m76w36CM7d4OYwNU cagdtXWqHQmCjRtC3wQZzkz345IdCfkfrtFBQ= 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=iDscdPbtIW6npI1Krkh41zQLrIhCWfZdrfKf5hxFQxoRJlqU4IjX4kDNqKgeKk6Ks6 9CPku26p52J5b/jMx+BwP6MRnFWnxa8T0+E8iM1nyK5y7e9hiCXoN3E5v9xHI0EVHp5L SoRWewALZ9+5hBH4HfrV7ZNhFU9wtPXGDHCwg= Received: by 10.220.203.200 with SMTP id fj8mr319142vcb.235.1290122499570; Thu, 18 Nov 2010 15:21:39 -0800 (PST) Received: from [192.168.0.3] ([203.214.34.44]) by mx.google.com with ESMTPS id y8sm237060vch.5.2010.11.18.15.21.37 (version=SSLv3 cipher=RC4-MD5); Thu, 18 Nov 2010 15:21:39 -0800 (PST) Subject: [PATCH 4/4] X25: remove bkl in routing ioctls From: Andrew Hendry To: netdev@vger.kernel.org Date: Fri, 19 Nov 2010 10:21:35 +1100 Message-ID: <1290122495.20070.63.camel@jaunty> Mime-Version: 1.0 X-Mailer: Evolution 2.30.3 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Routing doesn't use the socket data and is protected by x25_route_list_lock 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 2f235a6..2351ace 100644 --- a/net/x25/af_x25.c +++ b/net/x25/af_x25.c @@ -1412,9 +1412,7 @@ static int x25_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg) rc = -EPERM; if (!capable(CAP_NET_ADMIN)) break; - lock_kernel(); rc = x25_route_ioctl(cmd, argp); - unlock_kernel(); break; case SIOCX25GSUBSCRIP: lock_kernel(); @@ -1710,9 +1708,7 @@ static int compat_x25_ioctl(struct socket *sock, unsigned int cmd, rc = -EPERM; if (!capable(CAP_NET_ADMIN)) break; - lock_kernel(); rc = x25_route_ioctl(cmd, argp); - unlock_kernel(); break; case SIOCX25GSUBSCRIP: lock_kernel();