From 29f5aec11c2c41ae6c8873a70aa5fe00ba5c36b3 Mon Sep 17 00:00:00 2001 From: Javier Martinez Canillas Date: Mon, 3 Jan 2011 14:51:48 +0100 Subject: scullp: BLK ioctl pushdown API change --- scullp/main.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/scullp/main.c b/scullp/main.c index 0aba67d..20f7c3d 100644 --- a/scullp/main.c +++ b/scullp/main.c @@ -270,8 +270,7 @@ ssize_t scullp_write (struct file *filp, const char __user *buf, size_t count, * The ioctl() implementation */ -int scullp_ioctl (struct inode *inode, struct file *filp, - unsigned int cmd, unsigned long arg) +long scullp_ioctl (struct file *filp, unsigned int cmd, unsigned long arg) { int err = 0, ret = 0, tmp; @@ -479,7 +478,7 @@ struct file_operations scullp_fops = { .llseek = scullp_llseek, .read = scullp_read, .write = scullp_write, - .ioctl = scullp_ioctl, + .unlocked_ioctl = scullp_ioctl, .mmap = scullp_mmap, .open = scullp_open, .release = scullp_release, -- cgit v1.2.1-18-gbd029