static const struct file_operations dummy_fops = {};
-static long ioctl_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) {
+static long ioctl_ioctl(struct file *filp_, unsigned int cmd, unsigned long arg) {
struct fetch_fops_args args;
- struct fd f;
+ struct file *filp;
const struct file_operations *fops;
if (cmd != MOCTEL_FETCH_FOPS) return -EINVAL;
if (copy_from_user(&args, (struct fetch_fops_args __user *)arg, sizeof(args))) return -EINVAL;
- f = fdget(args.fd);
- if (!f.file) return -EBADF;
- fops = f.file->f_op;
- if (!fops) fops = dummy_fops;
- fdput(f);
+ filp = fget(args.fd);
+ if (!filp) return -EBADF;
+ fops = filp->f_op;
+ if (!fops) fops = &dummy_fops;
+ fput(filp);
if (copy_to_user((struct file_operations __user *)args.retp, fops, sizeof(*fops))) return -EINVAL;
return 0;
}
static const struct file_operations ioctl_fops = {
.owner = THIS_MODULE,
- .ioctl = ioctl_ioctl, /* I have no idea about locking,
- so just take the Big Kernel Lock implicitly. */
+ .unlocked_ioctl = ioctl_ioctl,
.open = ioctl_open,
.release = ioctl_release
};
.fops = &ioctl_fops
};
-static int __init init_ioctl() {
+static int __init init_ioctl(void) {
int ret;
printk(KERN_INFO "loading ioctl helper\n");
return ret;
}
-static void __exit cleanup_ioctl() {
+static void __exit cleanup_ioctl(void) {
printk(KERN_INFO "unloading ioctl helper\n");
misc_deregister(&ioctl_miscdev);
}