]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
um/mmapper: Remove BKL usage
authorArnd Bergmann <arnd@arndb.de>
Tue, 27 Apr 2010 14:24:23 +0000 (16:24 +0200)
committerFrederic Weisbecker <fweisbec@gmail.com>
Mon, 17 May 2010 03:27:03 +0000 (05:27 +0200)
An empty function does not need the BKL, so just remove it.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
arch/um/drivers/mmapper_kern.c

index d22f9e5c0eac5f483da649cfb7da2201c8888458..7158393b67933371250f029ef0ce7ea1e1c705dc 100644 (file)
@@ -46,8 +46,7 @@ static ssize_t mmapper_write(struct file *file, const char __user *buf,
        return count;
 }
 
-static int mmapper_ioctl(struct inode *inode, struct file *file,
-                        unsigned int cmd, unsigned long arg)
+static long mmapper_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 {
        return -ENOIOCTLCMD;
 }
@@ -90,7 +89,7 @@ static const struct file_operations mmapper_fops = {
        .owner          = THIS_MODULE,
        .read           = mmapper_read,
        .write          = mmapper_write,
-       .ioctl          = mmapper_ioctl,
+       .unlocked_ioctl = mmapper_ioctl,
        .mmap           = mmapper_mmap,
        .open           = mmapper_open,
        .release        = mmapper_release,