summaryrefslogtreecommitdiffstats
path: root/sculld
diff options
context:
space:
mode:
authorJavier Martinez Canillas <martinez.javier@gmail.com>2011-01-03 14:50:37 +0100
committerJavier Martinez Canillas <martinez.javier@gmail.com>2011-01-08 01:52:02 +0100
commit48c14e3f69ae82c767c917bad1abd5c7884bdb9b (patch)
tree1c8b8f6d919dd85e59745bc2716fb73078857f5d /sculld
parent4258b09a6f03c1b1c1a654085629d7201d4e6845 (diff)
downloadldd3-48c14e3f69ae82c767c917bad1abd5c7884bdb9b.tar.gz
sculld: BLK ioctl pushdown API change
Diffstat (limited to 'sculld')
-rw-r--r--sculld/main.c5
1 files changed, 2 insertions, 3 deletions
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,