scullv: BKL ioctl pushdown API change

huypq6 · Jan 8, 2011 · 2e1ee9a · 2e1ee9a
1 parent d6c73e6
commit 2e1ee9a
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/scullv/main.c b/scullv/main.c
@@ -270,8 +270,7 @@ ssize_t scullv_write (struct file *filp, const char __user *buf, size_t count,
  * The ioctl() implementation
  */
 
-int scullv_ioctl (struct inode *inode, struct file *filp,
-                 unsigned int cmd, unsigned long arg)
+long scullv_ioctl (struct file *filp, unsigned int cmd, unsigned long arg)
 {
 
 	int err = 0, ret = 0, tmp;
@@ -479,7 +478,7 @@ struct file_operations scullv_fops = {
 	.llseek =    scullv_llseek,
 	.read =	     scullv_read,
 	.write =     scullv_write,
-	.ioctl =     scullv_ioctl,
+	.unlocked_ioctl = scullv_ioctl,
 	.mmap =	     scullv_mmap,
 	.open =	     scullv_open,
 	.release =   scullv_release,