Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756135Ab0D0OZN (ORCPT ); Tue, 27 Apr 2010 10:25:13 -0400 Received: from moutng.kundenserver.de ([212.227.126.171]:65364 "EHLO moutng.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756102Ab0D0OZH (ORCPT ); Tue, 27 Apr 2010 10:25:07 -0400 From: Arnd Bergmann To: John Kacur Cc: lkml , Linus Torvalds , Frederic Weisbecker , Jan Blunck , Thomas Gleixner , Arnd Bergmann Subject: [PATCH 6/7] coda/psdev: remove BKL from ioctl function Date: Tue, 27 Apr 2010 16:24:24 +0200 Message-Id: <1272378265-10909-7-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 1.6.3.3 In-Reply-To: References: X-Provags-ID: V01U2FsdGVkX18KeJREGTInZMP+w1XioXaUY8XtY4iaSn41KRB vfHqKd5Oj2DsGWYUgI54ZjQr60qEcyWiARC240sLIeWwlISy0C pVdraaWjbmOCnPEanVm+Q== Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1270 Lines: 39 The ioctl function returns constant results, so it obviously does not need the BKL and can be converted to unlocked_ioctl. Signed-off-by: Arnd Bergmann --- fs/coda/psdev.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/fs/coda/psdev.c b/fs/coda/psdev.c index be4392c..66b9cf7 100644 --- a/fs/coda/psdev.c +++ b/fs/coda/psdev.c @@ -73,8 +73,7 @@ static unsigned int coda_psdev_poll(struct file *file, poll_table * wait) return mask; } -static int coda_psdev_ioctl(struct inode * inode, struct file * filp, - unsigned int cmd, unsigned long arg) +static long coda_psdev_ioctl(struct file * filp, unsigned int cmd, unsigned long arg) { unsigned int data; @@ -344,7 +343,7 @@ static const struct file_operations coda_psdev_fops = { .read = coda_psdev_read, .write = coda_psdev_write, .poll = coda_psdev_poll, - .ioctl = coda_psdev_ioctl, + .unlocked_ioctl = coda_psdev_ioctl, .open = coda_psdev_open, .release = coda_psdev_release, }; -- 1.6.3.3 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/