From patchwork Thu Nov 18 23:21:20 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: andrew hendry X-Patchwork-Id: 72167 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 6825DB71CB for ; Fri, 19 Nov 2010 10:21:31 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760326Ab0KRXV1 (ORCPT ); Thu, 18 Nov 2010 18:21:27 -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 S1758388Ab0KRXV0 (ORCPT ); Thu, 18 Nov 2010 18:21:26 -0500 Received: by mail-vw0-f46.google.com with SMTP id 13so2163943vws.19 for ; Thu, 18 Nov 2010 15:21:26 -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=/rN5CgbZPFhoXk+6el6dG61Hol8d2DsAXWfanZY7FFY=; b=MxLHwJrZbWJ1L+f+Twd/o2nFDcD1mtRIi+w0yK7nLkvAevB2vAwcIeXrzzctvZY6xY fBeUNAHymSN/AiKHHBQJGRYvvpYBk2vX6B0CfdJa30mXVCidaQU4FnPEcpD1Ptdz85BI 753+EU3Uk+Z5kbMim5gR+vDCZM4XCzVMZzYQo= 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=IGP65rmii1TConwH7RWGn+2Rfai9NAwjqXBkb5tS1W221BW5t1+NWLUaRDUh8nJWki K5/aSfflqGp5IsDbGcWYaOCwM06PJHfvc78WlWWpVlVfmv9L/vID9vlL+EQYKz5ik4W7 SGC9Q/T7t+OejKS0+gY4zfVgBIduXTGLivkhA= Received: by 10.220.179.205 with SMTP id br13mr302011vcb.178.1290122485856; Thu, 18 Nov 2010 15:21:25 -0800 (PST) Received: from [192.168.0.3] ([203.214.34.44]) by mx.google.com with ESMTPS id l9sm352194vbp.1.2010.11.18.15.21.23 (version=SSLv3 cipher=RC4-MD5); Thu, 18 Nov 2010 15:21:25 -0800 (PST) Subject: [PATCH 2/4] X25: remove bkl in timestamp ioctls From: Andrew Hendry To: netdev@vger.kernel.org Date: Fri, 19 Nov 2010 10:21:20 +1100 Message-ID: <1290122480.20070.61.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 Signed-off-by: Andrew Hendry --- net/x25/af_x25.c | 8 -------- 1 files changed, 0 insertions(+), 8 deletions(-) diff --git a/net/x25/af_x25.c b/net/x25/af_x25.c index c99029b..2259783 100644 --- a/net/x25/af_x25.c +++ b/net/x25/af_x25.c @@ -1387,19 +1387,15 @@ static int x25_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg) case SIOCGSTAMP: rc = -EINVAL; - lock_kernel(); if (sk) rc = sock_get_timestamp(sk, (struct timeval __user *)argp); - unlock_kernel(); break; case SIOCGSTAMPNS: rc = -EINVAL; - lock_kernel(); if (sk) rc = sock_get_timestampns(sk, (struct timespec __user *)argp); - unlock_kernel(); break; case SIOCGIFADDR: case SIOCSIFADDR: @@ -1689,19 +1685,15 @@ static int compat_x25_ioctl(struct socket *sock, unsigned int cmd, break; case SIOCGSTAMP: rc = -EINVAL; - lock_kernel(); if (sk) rc = compat_sock_get_timestamp(sk, (struct timeval __user*)argp); - unlock_kernel(); break; case SIOCGSTAMPNS: rc = -EINVAL; - lock_kernel(); if (sk) rc = compat_sock_get_timestampns(sk, (struct timespec __user*)argp); - unlock_kernel(); break; case SIOCGIFADDR: case SIOCSIFADDR: