X-Git-Url: http://git.thejh.net/?p=moctel.git;a=blobdiff_plain;f=moctel_mod.c;h=47d63f83c5bcf24006e2a057d717d665f925735a;hp=bb0652ef7d7de0ca234236bf23be3c4d585d2de8;hb=b1d5f41202848183d1b6e291afa448c631994d6c;hpb=9ca13033981db455c571e6f54f4ac24938afb94a

diff --git a/moctel_mod.c b/moctel_mod.c
index bb0652e..47d63f8 100644
--- a/moctel_mod.c
+++ b/moctel_mod.c
@@ -25,18 +25,18 @@ static int ioctl_open(struct inode *nodp, struct file *filp) {
 
 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;
 }
@@ -47,8 +47,7 @@ static int ioctl_release(struct inode *nodp, struct file *filp) {
 
 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
 };
@@ -59,7 +58,7 @@ static struct miscdevice ioctl_miscdev = {
   .fops = &ioctl_fops
 };
 
-static int __init init_ioctl() {
+static int __init init_ioctl(void) {
   int ret;
   printk(KERN_INFO "loading ioctl helper\n");
 
@@ -67,7 +66,7 @@ static int __init init_ioctl() {
   return ret;
 }
 
-static void __exit cleanup_ioctl() {
+static void __exit cleanup_ioctl(void) {
   printk(KERN_INFO "unloading ioctl helper\n");
   misc_deregister(&ioctl_miscdev);
 }