coda/psdev: Remove BKL from ioctl function
authorArnd Bergmann <arnd@arndb.de>
Tue, 27 Apr 2010 14:24:24 +0000 (16:24 +0200)
committerFrederic Weisbecker <fweisbec@gmail.com>
Mon, 17 May 2010 03:27:04 +0000 (05:27 +0200)
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 <arnd@arndb.de>
Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
fs/coda/psdev.c

index be4392ca20983345ae180a450fd0497442b135a8..66b9cf79c5ba2b5fa25e81e9f4c681d65e2ebe0b 100644 (file)
@@ -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,
 };