From 5f027b40d7402b782e4f26bc98ae635d0de8d316 Mon Sep 17 00:00:00 2001 From: Javier Martinez Canillas Date: Mon, 3 Jan 2011 14:50:37 +0100 Subject: sculld: BLK ioctl pushdown API change --- sculld/main.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'sculld/main.c') diff --git a/sculld/main.c b/sculld/main.c index 1039d84..8a6ecb1 100644 --- a/sculld/main.c +++ b/sculld/main.c @@ -279,8 +279,7 @@ ssize_t sculld_write (struct file *filp, const char __user *buf, size_t count, * The ioctl() implementation */ -int sculld_ioctl (struct inode *inode, struct file *filp, - unsigned int cmd, unsigned long arg) +long sculld_ioctl (struct file *filp, unsigned int cmd, unsigned long arg) { int err = 0, ret = 0, tmp; @@ -488,7 +487,7 @@ struct file_operations sculld_fops = { .llseek = sculld_llseek, .read = sculld_read, .write = sculld_write, - .ioctl = sculld_ioctl, + .unlocked_ioctl = sculld_ioctl, .mmap = sculld_mmap, .open = sculld_open, .release = sculld_release, -- cgit v1.2.1-18-gbd029